Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe98e92 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev

parents f89e6e38 878628fb

arch/ia64/hp/sim/simeth.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr) 
		return NOTIFY_DONE;

	}



	if (dev->nd_net != &init_net)

	if (dev_net(dev) != &init_net)

		return NOTIFY_DONE;



	if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE;

drivers/block/aoe/aoenet.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, 
	struct aoe_hdr *h;

	u32 n;



	if (ifp->nd_net != &init_net)

	if (dev_net(ifp) != &init_net)

		goto exit;



	skb = skb_share_check(skb, GFP_ATOMIC);

drivers/net/bonding/bond_3ad.c

+1 −1
Original line number Diff line number Diff line
@@ -2429,7 +2429,7 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac 
	struct slave *slave = NULL;

	int ret = NET_RX_DROP;



	if (dev->nd_net != &init_net)

	if (dev_net(dev) != &init_net)

		goto out;



	if (!(dev->flags & IFF_MASTER))

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct 
	struct arp_pkt *arp = (struct arp_pkt *)skb->data;

	int res = NET_RX_DROP;



	if (bond_dev->nd_net != &init_net)

	if (dev_net(bond_dev) != &init_net)

		goto out;



	if (!(bond_dev->flags & IFF_MASTER))

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2629,7 +2629,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack 
	unsigned char *arp_ptr;

	__be32 sip, tip;



	if (dev->nd_net != &init_net)

	if (dev_net(dev) != &init_net)

		goto out;



	if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))
@@ -3470,7 +3470,7 @@ static int bond_netdev_event(struct notifier_block *this, unsigned long event, v 
{

	struct net_device *event_dev = (struct net_device *)ptr;



	if (event_dev->nd_net != &init_net)

	if (dev_net(event_dev) != &init_net)

		return NOTIFY_DONE;



	dprintk("event_dev: %s, event: %lx\n",
@@ -3508,7 +3508,7 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event, 
	struct bonding *bond, *bond_next;

	struct vlan_entry *vlan, *vlan_next;



	if (ifa->ifa_dev->dev->nd_net != &init_net)

	if (dev_net(ifa->ifa_dev->dev) != &init_net)

		return NOTIFY_DONE;



	list_for_each_entry_safe(bond, bond_next, &bond_dev_list, bond_list) {