diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 19:07:29 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 19:07:29 +0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /net/openvswitch/flow.c | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
| download | linux-efc33ce197e4b6aaddf1eb2ba6293f51daf3c283.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'net/openvswitch/flow.c')
| -rw-r--r-- | net/openvswitch/flow.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 20605ecf100b..fe0e4215c73d 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -482,7 +482,11 @@ static __be16 parse_ethertype(struct sk_buff *skb) return htons(ETH_P_802_2); __skb_pull(skb, sizeof(struct llc_snap_hdr)); - return llc->ethertype; + + if (ntohs(llc->ethertype) >= 1536) + return llc->ethertype; + + return htons(ETH_P_802_2); } static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key, |