From f603f1f342547b597450b9d1e1e00b3e07c6e41b Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 5 May 2015 15:25:33 +0200 Subject: mac80211: remove useless skb->encapsulation check No current (and planned, as far as I know) wifi devices support encapsulation checksum offload, so remove the useless test here. Signed-off-by: Johannes Berg --- net/mac80211/tx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'net/mac80211/tx.c') diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index db5e40360924..8df134213adf 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2893,12 +2893,8 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, * fix it up in software before we handle anything else. */ if (skb->ip_summed == CHECKSUM_PARTIAL) { - if (skb->encapsulation) - skb_set_inner_transport_header(skb, - skb_checksum_start_offset(skb)); - else - skb_set_transport_header(skb, - skb_checksum_start_offset(skb)); + skb_set_transport_header(skb, + skb_checksum_start_offset(skb)); if (skb_checksum_help(skb)) goto out_free; } -- cgit