From: David S. Miller <davem@davemloft.net>
Date: Sun, 15 Nov 2015 23:00:48 +0000 (-0500)
Subject: Merge branch 'packet-fixes'
X-Git-Tag: firefly_0821_release~176^2~674^2~49
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52b4620294b772cdc56a9495bc0df1f81b389315;p=firefly-linux-kernel-4.4.55.git

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>
---

52b4620294b772cdc56a9495bc0df1f81b389315