summaryrefslogtreecommitdiffstats
path: root/net/ipv4/protocol.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-10-28 20:28:30 +0100
committerDavid S. Miller <davem@davemloft.net>2014-10-28 20:28:30 +0100
commit3923d68dc05033aa843b67d73110a6d402ac6e14 (patch)
tree84f2b9557b6d513f6127056949b4477af152c460 /net/ipv4/protocol.c
parentbpf: split eBPF out of NET (diff)
parentdsa: mv88e6171: Fix tagging protocol/Kconfig (diff)
downloadlinux-3923d68dc05033aa843b67d73110a6d402ac6e14.tar.xz
linux-3923d68dc05033aa843b67d73110a6d402ac6e14.zip
Merge branch 'dsa-net'
Andrew Lunn says: ==================== DSA tagging mismatches The second patch is a fix, which should be applied to -rc. It is possible to get a DSA configuration which does not work. The patch stops this happening. The first patch detects this situation, and errors out the probe of DSA, making it more obvious something is wrong. It is not required to apply it -rc. v2 fixes the use case pointed out by Florian, that a switch driver may use DSA_TAG_PROTO_NONE which the patch did not correctly handle. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/protocol.c')
0 files changed, 0 insertions, 0 deletions