redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Pull networking fixes from David Miller:
 "The main purpose of this pull request is to fix up the erroneous
  bonding patch I applied last round.  I meant to apply v4 of the patch
  from Jiri but I applied v3 by accident.  Mea culpa.

  Also, eagle eyed Dan Carpenter noticed that openvswitch has one of
  those "X = alloc(); if (!Y)" mistakes, test the proper pointer
  instead."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  openvswitch: checking wrong variable in queue_userspace_packet()
  bonding: Fix LACPDU rx_dropped commit.
This commit is contained in:
Linus Torvalds 2012-05-14 11:19:32 -07:00
parent eea41aee2b 8aa51d64c1
commit d69c5c2cf2
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/bonding/bond_alb.c
View file

@ -342,26 +342,26 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
_unlock_rx_hashtbl_bh(bond); _unlock_rx_hashtbl_bh(bond);
} }
static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond, static int rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
struct slave *slave) struct slave *slave)
{ {
struct arp_pkt *arp; struct arp_pkt *arp;
if (skb->protocol != cpu_to_be16(ETH_P_ARP)) if (skb->protocol != cpu_to_be16(ETH_P_ARP))
return; goto out;
arp = (struct arp_pkt *) skb->data; arp = (struct arp_pkt *) skb->data;
if (!arp) { if (!arp) {
pr_debug("Packet has no ARP data\n"); pr_debug("Packet has no ARP data\n");
return; goto out;
} }
if (!pskb_may_pull(skb, arp_hdr_len(bond->dev))) if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
return; goto out;
if (skb->len < sizeof(struct arp_pkt)) { if (skb->len < sizeof(struct arp_pkt)) {
pr_debug("Packet is too small to be an ARP\n"); pr_debug("Packet is too small to be an ARP\n");
return; goto out;
} }
if (arp->op_code == htons(ARPOP_REPLY)) { if (arp->op_code == htons(ARPOP_REPLY)) {
@ -369,6 +369,8 @@ static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
rlb_update_entry_from_arp(bond, arp); rlb_update_entry_from_arp(bond, arp);
pr_debug("Server received an ARP Reply from client\n"); pr_debug("Server received an ARP Reply from client\n");
} }
out:
return RX_HANDLER_ANOTHER;
} }
/* Caller must hold bond lock for read */ /* Caller must hold bond lock for read */

2
drivers/net/bonding/bonding.h
View file

@ -218,7 +218,7 @@ struct bonding {
struct slave *primary_slave; struct slave *primary_slave;
bool force_primary; bool force_primary;
s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ s32 slave_cnt; /* never change this value outside the attach/detach wrappers */
void (*recv_probe)(struct sk_buff *, struct bonding *, int (*recv_probe)(struct sk_buff *, struct bonding *,
struct slave *); struct slave *);
rwlock_t lock; rwlock_t lock;
rwlock_t curr_slave_lock; rwlock_t curr_slave_lock;

2
net/openvswitch/datapath.c
View file

@ -321,7 +321,7 @@ static int queue_userspace_packet(int dp_ifindex, struct sk_buff *skb,
return -ENOMEM; return -ENOMEM;
nskb = __vlan_put_tag(nskb, vlan_tx_tag_get(nskb)); nskb = __vlan_put_tag(nskb, vlan_tx_tag_get(nskb));
if (!skb) if (!nskb)
return -ENOMEM; return -ENOMEM;
nskb->vlan_tci = 0; nskb->vlan_tci = 0;