Merge branch 'packet-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Nov 2015 23:00:48 +0000 (18:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Nov 2015 23:00:48 +0000 (18:00 -0500)
commit52b4620294b772cdc56a9495bc0df1f81b389315
treedb5aba8f1e47af35a7557bff779b80a1a0daadbc
parentd7475de58575c904818efa369c82e88c6648ce2e
parent5cfb4c8d05b4409c4044cb9c05b19705c1d9818b
Merge branch 'packet-fixes'

Daniel Borkmann says:

====================
packet fixes

Fixes a couple of issues in packet sockets, i.e. on TX ring side. See
individual patches for details.

v2 -> v3:
 - First two patches unchanged, kept Jason's Ack
 - Reworked 3rd patch and split into 3:
  - check for dev type as discussed with Willem
  - infer skb->protocol
  - fix max len for dgram
v1 -> v2:
 - Added patch 2 as suggested by Dave
 - Rest is unchanged from previous submission
====================

Signed-off-by: David S. Miller <davem@davemloft.net>