Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [VLAN]: Avoid a 4-order allocation.
  [HDLC] Fix dev->header_cache_update having a random value.
  [NetLabel]: Verify sensitivity level has a valid CIPSO mapping
  [PPPOE]: Key connections properly on local device.
  [AF_UNIX]: Test against sk_max_ack_backlog properly.
  [NET]: Fix bugs in "Whether sock accept queue is full" checking
  • Loading branch information
Linus Torvalds committed Mar 4, 2007
2 parents 4227003 + 5c15bde commit 6d04e3b
Show file tree
Hide file tree
Showing 32 changed files with 165 additions and 130 deletions.
3 changes: 1 addition & 2 deletions drivers/net/8139cp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,7 @@ static void cp_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
spin_lock_irqsave(&cp->lock, flags);
cp->cpcmd &= ~RxVlanOn;
cpw16(CpCmd, cp->cpcmd);
if (cp->vlgrp)
cp->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(cp->vlgrp, vid, NULL);
spin_unlock_irqrestore(&cp->lock, flags);
}
#endif /* CP_VLAN_TAG_USED */
Expand Down
5 changes: 1 addition & 4 deletions drivers/net/acenic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2293,10 +2293,7 @@ static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

local_irq_save(flags);
ace_mask_irq(dev);

if (ap->vlgrp)
ap->vlgrp->vlan_devices[vid] = NULL;

vlan_group_set_device(ap->vlgrp, vid, NULL);
ace_unmask_irq(dev);
local_irq_restore(flags);
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/amd8111e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1737,8 +1737,7 @@ static void amd8111e_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid
{
struct amd8111e_priv *lp = netdev_priv(dev);
spin_lock_irq(&lp->lock);
if (lp->vlgrp)
lp->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(lp->vlgrp, vid, NULL);
spin_unlock_irq(&lp->lock);
}
#endif
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/atl1/atl1_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1252,8 +1252,7 @@ static void atl1_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)

spin_lock_irqsave(&adapter->lock, flags);
/* atl1_irq_disable(adapter); */
if (adapter->vlgrp)
adapter->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(adapter->vlgrp, vid, NULL);
/* atl1_irq_enable(adapter); */
spin_unlock_irqrestore(&adapter->lock, flags);
/* We don't do Vlan filtering */
Expand All @@ -1266,7 +1265,7 @@ static void atl1_restore_vlan(struct atl1_adapter *adapter)
if (adapter->vlgrp) {
u16 vid;
for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
if (!adapter->vlgrp->vlan_devices[vid])
if (!vlan_group_get_device(adapter->vlgrp, vid))
continue;
atl1_vlan_rx_add_vid(adapter->netdev, vid);
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4467,9 +4467,7 @@ bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
struct bnx2 *bp = netdev_priv(dev);

bnx2_netif_stop(bp);

if (bp->vlgrp)
bp->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(bp->vlgrp, vid, NULL);
bnx2_set_rx_mode(dev);

bnx2_netif_start(bp);
Expand Down
14 changes: 7 additions & 7 deletions drivers/net/bonding/bond_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,9 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
/* Save and then restore vlan_dev in the grp array,
* since the slave's driver might clear it.
*/
vlan_dev = bond->vlgrp->vlan_devices[vid];
vlan_dev = vlan_group_get_device(bond->vlgrp, vid);
slave_dev->vlan_rx_kill_vid(slave_dev, vid);
bond->vlgrp->vlan_devices[vid] = vlan_dev;
vlan_group_set_device(bond->vlgrp, vid, vlan_dev);
}
}

Expand Down Expand Up @@ -550,9 +550,9 @@ static void bond_del_vlans_from_slave(struct bonding *bond, struct net_device *s
/* Save and then restore vlan_dev in the grp array,
* since the slave's driver might clear it.
*/
vlan_dev = bond->vlgrp->vlan_devices[vlan->vlan_id];
vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
slave_dev->vlan_rx_kill_vid(slave_dev, vlan->vlan_id);
bond->vlgrp->vlan_devices[vlan->vlan_id] = vlan_dev;
vlan_group_set_device(bond->vlgrp, vlan->vlan_id, vlan_dev);
}

unreg:
Expand Down Expand Up @@ -2397,7 +2397,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
vlan_id = 0;
list_for_each_entry_safe(vlan, vlan_next, &bond->vlan_list,
vlan_list) {
vlan_dev = bond->vlgrp->vlan_devices[vlan->vlan_id];
vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
if (vlan_dev == rt->u.dst.dev) {
vlan_id = vlan->vlan_id;
dprintk("basa: vlan match on %s %d\n",
Expand Down Expand Up @@ -2444,7 +2444,7 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
}

list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
vlan_dev = bond->vlgrp->vlan_devices[vlan->vlan_id];
vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
if (vlan->vlan_ip) {
bond_arp_send(slave->dev, ARPOP_REPLY, vlan->vlan_ip,
vlan->vlan_ip, vlan->vlan_id);
Expand Down Expand Up @@ -3371,7 +3371,7 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,

list_for_each_entry_safe(vlan, vlan_next, &bond->vlan_list,
vlan_list) {
vlan_dev = bond->vlgrp->vlan_devices[vlan->vlan_id];
vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
if (vlan_dev == event_dev) {
switch (event) {
case NETDEV_UP:
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/chelsio/cxgb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,8 +889,7 @@ static void vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
struct adapter *adapter = dev->priv;

spin_lock_irq(&adapter->async_lock);
if (adapter->vlan_grp)
adapter->vlan_grp->vlan_devices[vid] = NULL;
vlan_group_set_device(adapter->vlan_grp, vid, NULL);
spin_unlock_irq(&adapter->async_lock);
}
#endif
Expand Down
6 changes: 4 additions & 2 deletions drivers/net/cxgb3/cxgb3_offload.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,16 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
int i;

for_each_port(adapter, i) {
const struct vlan_group *grp;
struct vlan_group *grp;
struct net_device *dev = adapter->port[i];
const struct port_info *p = netdev_priv(dev);

if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) {
if (vlan && vlan != VLAN_VID_MASK) {
grp = p->vlan_grp;
dev = grp ? grp->vlan_devices[vlan] : NULL;
dev = NULL;
if (grp)
dev = vlan_group_get_device(grp, vlan);
} else
while (dev->master)
dev = dev->master;
Expand Down
13 changes: 5 additions & 8 deletions drivers/net/e1000/e1000_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
uint16_t vid = adapter->hw.mng_cookie.vlan_id;
uint16_t old_vid = adapter->mng_vlan_id;
if (adapter->vlgrp) {
if (!adapter->vlgrp->vlan_devices[vid]) {
if (!vlan_group_get_device(adapter->vlgrp, vid)) {
if (adapter->hw.mng_cookie.status &
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
e1000_vlan_rx_add_vid(netdev, vid);
Expand All @@ -386,7 +386,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)

if ((old_vid != (uint16_t)E1000_MNG_VLAN_NONE) &&
(vid != old_vid) &&
!adapter->vlgrp->vlan_devices[old_vid])
!vlan_group_get_device(adapter->vlgrp, old_vid))
e1000_vlan_rx_kill_vid(netdev, old_vid);
} else
adapter->mng_vlan_id = vid;
Expand Down Expand Up @@ -1482,7 +1482,7 @@ e1000_close(struct net_device *netdev)
if ((adapter->hw.mng_cookie.status &
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
!(adapter->vlgrp &&
adapter->vlgrp->vlan_devices[adapter->mng_vlan_id])) {
vlan_group_get_device(adapter->vlgrp, adapter->mng_vlan_id))) {
e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
}

Expand Down Expand Up @@ -4998,10 +4998,7 @@ e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
uint32_t vfta, index;

e1000_irq_disable(adapter);

if (adapter->vlgrp)
adapter->vlgrp->vlan_devices[vid] = NULL;

vlan_group_set_device(adapter->vlgrp, vid, NULL);
e1000_irq_enable(adapter);

if ((adapter->hw.mng_cookie.status &
Expand All @@ -5027,7 +5024,7 @@ e1000_restore_vlan(struct e1000_adapter *adapter)
if (adapter->vlgrp) {
uint16_t vid;
for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
if (!adapter->vlgrp->vlan_devices[vid])
if (!vlan_group_get_device(adapter->vlgrp, vid))
continue;
e1000_vlan_rx_add_vid(adapter->netdev, vid);
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ehea/ehea_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1939,8 +1939,7 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
int index;
u64 hret;

if (port->vgrp)
port->vgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(port->vgrp, vid, NULL);

cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);
if (!cb1) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/gianfar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,8 +1132,7 @@ static void gfar_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)

spin_lock_irqsave(&priv->rxlock, flags);

if (priv->vlgrp)
priv->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(priv->vgrp, vid, NULL);

spin_unlock_irqrestore(&priv->rxlock, flags);
}
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/ixgb/ixgb_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2213,8 +2213,7 @@ ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)

ixgb_irq_disable(adapter);

if(adapter->vlgrp)
adapter->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(adapter->vlgrp, vid, NULL);

ixgb_irq_enable(adapter);

Expand All @@ -2234,7 +2233,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter)
if(adapter->vlgrp) {
uint16_t vid;
for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
if(!adapter->vlgrp->vlan_devices[vid])
if(!vlan_group_get_device(adapter->vlgrp, vid))
continue;
ixgb_vlan_rx_add_vid(adapter->netdev, vid);
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ns83820.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,7 @@ static void ns83820_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid

spin_lock_irq(&dev->misc_lock);
spin_lock(&dev->tx_lock);
if (dev->vlgrp)
dev->vlgrp->vlan_devices[vid] = NULL;
vlan_group_set_device(dev->vlgrp, vid, NULL);
spin_unlock(&dev->tx_lock);
spin_unlock_irq(&dev->misc_lock);
}
Expand Down
Loading

0 comments on commit 6d04e3b

Please sign in to comment.