Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f6367b4660dde412f9b7af94763efb1d89cefb74

Authored by Vlad Yasevich
Committed by David S. Miller
1 parent 1ee481fb4c
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

bridge: use is_skb_forwardable in forward path 

Use existing function instead of trying to use our own.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 7 deletions Side-by-side Diff

net/bridge/br_forward.c
Diff comments   View file @ f6367b4
... ... @@ -35,16 +35,11 @@
35 35 p->state == BR_STATE_FORWARDING;
36 36 }
37 37  
38   -static inline unsigned int packet_length(const struct sk_buff *skb)
39   -{
40   - return skb->len - (skb->protocol == htons(ETH_P_8021Q) ? VLAN_HLEN : 0);
41   -}
42   -
43 38 int br_dev_queue_push_xmit(struct sk_buff *skb)
44 39 {
45 40 /* ip_fragment doesn't copy the MAC header */
46 41 if (nf_bridge_maybe_copy_header(skb) ||
47   - (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))) {
  42 + !is_skb_forwardable(skb->dev, skb)) {
48 43 kfree_skb(skb);
49 44 } else {
50 45 skb_push(skb, ETH_HLEN);
... ... @@ -71,7 +66,7 @@
71 66 skb->dev = to->dev;
72 67  
73 68 if (unlikely(netpoll_tx_running(to->br->dev))) {
74   - if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))
  69 + if (!is_skb_forwardable(skb->dev, skb))
75 70 kfree_skb(skb);
76 71 else {
77 72 skb_push(skb, ETH_HLEN);