diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 06:27:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 06:27:18 -0400 |
| commit | 4958134df54c2c84e9c22ea042761d439164d26e (patch) | |
| tree | 503177afab11f7d25b12a84ce25b481d305c51ba /net/batman-adv/soft-interface.c | |
| parent | c4f528795d1add8b63652673f7262729f679c6c1 (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
Merge 4.16-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 900c5ce21cd4..367a81fb785f 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
| @@ -459,13 +459,7 @@ void batadv_interface_rx(struct net_device *soft_iface, | |||
| 459 | 459 | ||
| 460 | /* skb->dev & skb->pkt_type are set here */ | 460 | /* skb->dev & skb->pkt_type are set here */ |
| 461 | skb->protocol = eth_type_trans(skb, soft_iface); | 461 | skb->protocol = eth_type_trans(skb, soft_iface); |
| 462 | 462 | skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); | |
| 463 | /* should not be necessary anymore as we use skb_pull_rcsum() | ||
| 464 | * TODO: please verify this and remove this TODO | ||
| 465 | * -- Dec 21st 2009, Simon Wunderlich | ||
| 466 | */ | ||
| 467 | |||
| 468 | /* skb->ip_summed = CHECKSUM_UNNECESSARY; */ | ||
| 469 | 463 | ||
| 470 | batadv_inc_counter(bat_priv, BATADV_CNT_RX); | 464 | batadv_inc_counter(bat_priv, BATADV_CNT_RX); |
| 471 | batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, | 465 | batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, |