Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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))