From: Bjørn Mork Date: Fri, 9 May 2014 12:45:00 +0000 (+0200) Subject: net: cdc_mbim: handle unaccelerated VLAN tagged frames X-Git-Tag: omap-for-v3.16/fixes-against-rc1~146^2~51 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b5eeb7f874b689403e52a646e485d0191ab9507;p=pandora-kernel.git net: cdc_mbim: handle unaccelerated VLAN tagged frames This driver maps 802.1q VLANs to MBIM sessions. The mapping is based on a bogus assumption that all tagged frames will use the acceleration API because we enable NETIF_F_HW_VLAN_CTAG_TX. This fails for e.g. frames tagged in userspace using packet sockets. Such frames will erroneously be considered as untagged and silently dropped based on not being IP. Fix by falling back to looking into the ethernet header for a tag if no accelerated tag was found. Fixes: a82c7ce5bc5b ("net: cdc_ncm: map MBIM IPS SessionID to VLAN ID") Cc: Greg Suarez Signed-off-by: Bjørn Mork Signed-off-by: David S. Miller --- Reading git-diff-tree failed