diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-28 14:05:54 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-28 14:05:54 +0300 |
| commit | 399f157afd30ad942e08dfa0ab28734c50bc6b00 (patch) | |
| tree | a772e97b85d91ae5553707f597b4443a511c99ec /net/openvswitch/datapath.c | |
| parent | a09975bf6c756e4555a95258ff4b2286dcfddc4e (diff) | |
| parent | 1a08e3d9e0ac4577ba89dbdb38f593fe050f88fc (diff) | |
| download | linux-399f157afd30ad942e08dfa0ab28734c50bc6b00.tar.xz | |
Merge branch 'devel-stable' into misc
Diffstat (limited to 'net/openvswitch/datapath.c')
| -rw-r--r-- | net/openvswitch/datapath.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 2d4c4d3911c0..9c62b6325f7a 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -606,7 +606,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) rcu_assign_pointer(flow->sf_acts, acts); packet->priority = flow->key.phy.priority; packet->mark = flow->key.phy.skb_mark; - packet->protocol = flow->key.eth.type; rcu_read_lock(); dp = get_dp_rcu(net, ovs_header->dp_ifindex); |