diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:36 +1100 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:42 +1100 |
| commit | f3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch) | |
| tree | 3663ab29736373c565d88e941162d37311cc3c75 /net/openvswitch/datapath.c | |
| parent | 2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff) | |
| parent | 849a2d3d9be31368559e6852cf64d749e6903818 (diff) | |
| download | talos-obmc-linux-openbmc-20160202-1.tar.gz talos-obmc-linux-openbmc-20160202-1.zip | |
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/openvswitch/datapath.c')
| -rw-r--r-- | net/openvswitch/datapath.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index c5d08ee37730..6e9a2220939d 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -337,12 +337,10 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, unsigned short gso_type = skb_shinfo(skb)->gso_type; struct sw_flow_key later_key; struct sk_buff *segs, *nskb; - struct ovs_skb_cb ovs_cb; int err; - ovs_cb = *OVS_CB(skb); + BUILD_BUG_ON(sizeof(*OVS_CB(skb)) > SKB_SGO_CB_OFFSET); segs = __skb_gso_segment(skb, NETIF_F_SG, false); - *OVS_CB(skb) = ovs_cb; if (IS_ERR(segs)) return PTR_ERR(segs); if (segs == NULL) @@ -360,7 +358,6 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, /* Queue all of the segments. */ skb = segs; do { - *OVS_CB(skb) = ovs_cb; if (gso_type & SKB_GSO_UDP && skb != segs) key = &later_key; |
