]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mac80211: remove useless skb->encapsulation check
authorJohannes Berg <johannes.berg@intel.com>
Tue, 5 May 2015 13:25:33 +0000 (15:25 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 5 May 2015 13:25:33 +0000 (15:25 +0200)
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 <johannes.berg@intel.com>
net/mac80211/tx.c

index db5e40360924f8ecc159d28abad8536626d5c058..8df134213adfc563660befa1960c2eaee205617c 100644 (file)
@@ -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;
                }