From a281a9bd532765c8db6733af7f8be5f53d8998c2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 20 Jul 2012 14:47:54 -0700 Subject: [PATCH] --- yaml --- r: 315749 b: refs/heads/master c: a1b5d0dd28e9cb4fe42ad2df4ebbe5cce96866d7 h: refs/heads/master i: 315747: e4993be8553ab39cc2810809e507d8aab1fc827c v: v3 --- [refs] | 2 +- trunk/net/openvswitch/datapath.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a79586cdcfd9..0c0155d4cab2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92e5dfc34cf39c20ae1087bd5e676238b5d0dfac +refs/heads/master: a1b5d0dd28e9cb4fe42ad2df4ebbe5cce96866d7 diff --git a/trunk/net/openvswitch/datapath.c b/trunk/net/openvswitch/datapath.c index 670e63020667..29dbfcb65d92 100644 --- a/trunk/net/openvswitch/datapath.c +++ b/trunk/net/openvswitch/datapath.c @@ -263,6 +263,7 @@ int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb, static int queue_gso_packets(int dp_ifindex, struct sk_buff *skb, const struct dp_upcall_info *upcall_info) { + unsigned short gso_type = skb_shinfo(skb)->gso_type; struct dp_upcall_info later_info; struct sw_flow_key later_key; struct sk_buff *segs, *nskb; @@ -279,7 +280,7 @@ static int queue_gso_packets(int dp_ifindex, struct sk_buff *skb, if (err) break; - if (skb == segs && skb_shinfo(skb)->gso_type & SKB_GSO_UDP) { + if (skb == segs && gso_type & SKB_GSO_UDP) { /* The initial flow key extracted by ovs_flow_extract() * in this case is for a first fragment, so we need to * properly mark later fragments.