diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-12 16:32:55 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-12 16:32:55 -0300 |
commit | e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00 (patch) | |
tree | da2f71ca3469aea362df4b9885b01bcc068bfc91 /kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch | |
parent | 6abc75d5f0c4d5c8302715a7da59cc02d22fbe36 (diff) | |
parent | 8d0f4ac4cbf56fc5c5cadb5ba09c35e3674a886b (diff) | |
download | abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.gz abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.bz2 abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/tomb/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch')
-rw-r--r-- | kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch new file mode 100644 index 000000000..2840f190c --- /dev/null +++ b/kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch @@ -0,0 +1,13 @@ +diff --git a/net/core/dev.c b/net/core/dev.c +index 45fa2f1..6088927 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help); + __be16 skb_network_protocol(struct sk_buff *skb, int *depth) + { + __be16 type = skb->protocol; +- int vlan_depth = ETH_HLEN; ++ int vlan_depth = skb->mac_len; + + /* Tunnel gso handlers can set protocol to ethernet. */ + if (type == htons(ETH_P_TEB)) { |