diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-12 01:02:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-12 01:02:55 +0200 |
| commit | 902455e00720018d1dbd38327c3fd5bda6d844ee (patch) | |
| tree | 02fc906c5bc318220ad4827c6eac2521b9d1fbbf /net/core | |
| parent | net/fsl: xgmac_mdio is dependent on OF_MDIO (diff) | |
| parent | net/core: Add VF link state control policy (diff) | |
| download | linux-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.xz linux-902455e00720018d1dbd38327c3fd5bda6d844ee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/core/rtnetlink.c
net/core/skbuff.c
Both conflicts were very simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 5 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 3 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ed8fe62d41af..ab6c491bd2d3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6634,6 +6634,9 @@ EXPORT_SYMBOL(unregister_netdevice_queue); /** * unregister_netdevice_many - unregister many devices * @head: list of devices + * + * Note: As most callers use a stack allocated list_head, + * we force a list_del() to make sure stack wont be corrupted later. */ void unregister_netdevice_many(struct list_head *head) { @@ -6643,6 +6646,7 @@ void unregister_netdevice_many(struct list_head *head) rollback_registered_many(head); list_for_each_entry(dev, head, unreg_list) net_set_todo(dev); + list_del(head); } } EXPORT_SYMBOL(unregister_netdevice_many); @@ -7098,7 +7102,6 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list) } } unregister_netdevice_many(&dev_kill_list); - list_del(&dev_kill_list); rtnl_unlock(); } diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 741b22c62acf..233b5ae87583 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1216,6 +1216,8 @@ static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = { .len = sizeof(struct ifla_vf_spoofchk) }, [IFLA_VF_RATE] = { .type = NLA_BINARY, .len = sizeof(struct ifla_vf_rate) }, + [IFLA_VF_LINK_STATE] = { .type = NLA_BINARY, + .len = sizeof(struct ifla_vf_link_state) }, }; static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = { @@ -1770,7 +1772,6 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh) ops->dellink(dev, &list_kill); unregister_netdevice_many(&list_kill); - list_del(&list_kill); return 0; } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b9e85e6cb26a..bf92824af3f7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2885,6 +2885,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, int pos; int dummy; + __skb_push(head_skb, doffset); proto = skb_network_protocol(head_skb, &dummy); if (unlikely(!proto)) return ERR_PTR(-EINVAL); @@ -2892,7 +2893,6 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, csum = !head_skb->encap_hdr_csum && !!can_checksum_protocol(features, proto); - __skb_push(head_skb, doffset); headroom = skb_headroom(head_skb); pos = skb_headlen(head_skb); |