diff options
| author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-07-14 10:09:33 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:52 -0600 |
| commit | e43925f4db29bd19a8907b0cba1adde455f07a34 (patch) | |
| tree | 3eb83bf54454e66ce11ae543e3015893dbdf6f60 | |
| parent | 0aa5d34a2efdf02247d366af88a7753447618c17 (diff) | |
ER263529: merge net/core/dev.c changes
This is a temp fix for ER263529. Without this patch kernel crashes during
Android boot.
Proper fix for this problem requires updates in Phonet and SHRM drivers.
IR266911 has been created for that work.
These changes were submitted by Kishor LALA <kishor.lala@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: Iaeae7cf2c898b655143e933e38f816111829ea22
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2838
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 264137fce3a..b1ae7b12b76 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2503,11 +2503,13 @@ int netif_receive_skb(struct sk_buff *skb) if (netpoll_receive_skb(skb)) return NET_RX_DROP; + if (!skb->skb_iif) skb->skb_iif = skb->dev->ifindex; null_or_orig = NULL; orig_dev = skb->dev; +#if 0 master = ACCESS_ONCE(orig_dev->master); if (master) { if (skb_bond_should_drop(skb, master)) @@ -2515,7 +2517,7 @@ int netif_receive_skb(struct sk_buff *skb) else skb->dev = master; } - +#endif __get_cpu_var(netdev_rx_stat).total++; skb_reset_network_header(skb); @@ -2555,7 +2557,7 @@ ncls: skb = handle_macvlan(skb, &pt_prev, &ret, orig_dev); if (!skb) goto out; - +#if 0 /* * Make sure frames received on VLAN interfaces stacked on * bonding interfaces still make their way to any base bonding @@ -2567,7 +2569,7 @@ ncls: (vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING)) { null_or_bond = vlan_dev_real_dev(skb->dev); } - +#endif type = skb->protocol; list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) { |