diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-01 11:42:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-01 11:42:15 -0700 |
| commit | c70ed3f77ca646c6e57bee54d570d9dab1246589 (patch) | |
| tree | a50c0121e9b433d189c130f15cbe774571c44586 /net/openvswitch/actions.c | |
| parent | 34e1ec319e99322bfed02767d51f4998a961d205 (diff) | |
| parent | e6896163b20cc2dc1c169fa5e007243a4f9650a4 (diff) | |
| download | linux-c70ed3f77ca646c6e57bee54d570d9dab1246589.tar.gz linux-c70ed3f77ca646c6e57bee54d570d9dab1246589.tar.bz2 linux-c70ed3f77ca646c6e57bee54d570d9dab1246589.zip | |
Merge branch 'net-openvswitch-improve-the-codes'
Tonghao Zhang says:
====================
net: openvswitch: improve the codes
This series patches are not bug fix, just improve codes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index fd340893a27c..855f2c155956 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -741,7 +741,8 @@ static int set_sctp(struct sk_buff *skb, struct sw_flow_key *flow_key, return 0; } -static int ovs_vport_output(struct net *net, struct sock *sk, struct sk_buff *skb) +static int ovs_vport_output(struct net *net, struct sock *sk, + struct sk_buff *skb) { struct ovs_frag_data *data = this_cpu_ptr(&ovs_frag_data_storage); struct vport *vport = data->vport; @@ -920,7 +921,7 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb, upcall.mru = OVS_CB(skb)->mru; for (a = nla_data(attr), rem = nla_len(attr); rem > 0; - a = nla_next(a, &rem)) { + a = nla_next(a, &rem)) { switch (nla_type(a)) { case OVS_USERSPACE_ATTR_USERDATA: upcall.userdata = a; |