diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-31 16:04:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-31 16:04:23 -0400 |
| commit | fea1829f9ba262442ad9fc91cfe9284fa9ea8458 (patch) | |
| tree | fe623c6c6c86cde1718238329a34b728185cc4f3 /include/linux | |
| parent | 9109e17f7c3ace48629397b44db5ce06bf168644 (diff) | |
| parent | f6367b4660dde412f9b7af94763efb1d89cefb74 (diff) | |
| download | cachepc-linux-fea1829f9ba262442ad9fc91cfe9284fa9ea8458.tar.gz cachepc-linux-fea1829f9ba262442ad9fc91cfe9284fa9ea8458.zip | |
Merge branch 'bridge_8021AD'
Vlad Yasevich says:
====================
bridge: Fix forwarding of 8021AD frames
Bridge has its own way to deterine if the packet is forwardable and it doesn't
support 8021ad tags correctly. Instead just allow bridge to use an
existing is_skb_forwardable() function.
v2: Fix missing hunk in patch 2/2 to make it build.
v3: Fix indent for is_skb_forwardable
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 06287c110241..29b579fb5196 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2629,6 +2629,7 @@ int dev_get_phys_port_id(struct net_device *dev, int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, struct netdev_queue *txq); int dev_forward_skb(struct net_device *dev, struct sk_buff *skb); +bool is_skb_forwardable(struct net_device *dev, struct sk_buff *skb); extern int netdev_budget; |