diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-31 13:13:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-31 13:13:24 -0800 |
| commit | 5403c8a29521a6eb02f9283dbbe0184527f8f42b (patch) | |
| tree | 4f1ca17feda4dfa88f53eceeaa39583ec840d27e /net/core | |
| parent | c79b9e4936142d5ed26073d58bdd4a5a0ac62f32 (diff) | |
| parent | c4c93106741bbf61ecd05a2a835af8e3bf31c1bd (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 1 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ddd5df2b61d..9109e2648d4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3564,6 +3564,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) __skb_pull(skb, skb_headlen(skb)); skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb)); skb->vlan_tci = 0; + skb->dev = napi->dev; napi->skb = skb; } diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index b706271ccb1..da0fe457c85 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1704,6 +1704,9 @@ replay: snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind); dest_net = rtnl_link_get_net(net, tb); + if (IS_ERR(dest_net)) + return PTR_ERR(dest_net); + dev = rtnl_create_link(net, dest_net, ifname, ops, tb); if (IS_ERR(dev)) |