diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-07-25 21:49:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-25 21:49:20 -0700 |
| commit | c43212bb7bebe24a93a7a7d86e767e1ce295d72a (patch) | |
| tree | ec43ad59bbc09fa3ddc8382f33100bd1434fe182 /include/net/tc_act/tc_nat.h | |
| parent | ipvlan: Scrub skb before crossing the namespace boundry (diff) | |
| parent | net_sched: get rid of struct tcf_common (diff) | |
| download | linux-dev-c43212bb7bebe24a93a7a7d86e767e1ce295d72a.tar.xz linux-dev-c43212bb7bebe24a93a7a7d86e767e1ce295d72a.zip | |
Merge branch 'refactor-tc_action-structs'
Cong Wang says:
====================
net_sched: refactor tc action structures
These two patches factor out the struct tcf_common.
v2: fix a compile warning
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tc_act/tc_nat.h')
| -rw-r--r-- | include/net/tc_act/tc_nat.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/tc_act/tc_nat.h b/include/net/tc_act/tc_nat.h index 63d8e9ca9d99..56681a320612 100644 --- a/include/net/tc_act/tc_nat.h +++ b/include/net/tc_act/tc_nat.h @@ -5,7 +5,7 @@ #include <net/act_api.h> struct tcf_nat { - struct tcf_common common; + struct tc_action common; __be32 old_addr; __be32 new_addr; @@ -13,9 +13,6 @@ struct tcf_nat { u32 flags; }; -static inline struct tcf_nat *to_tcf_nat(struct tc_action *a) -{ - return container_of(a->priv, struct tcf_nat, common); -} +#define to_tcf_nat(a) ((struct tcf_nat *)a) #endif /* __NET_TC_NAT_H */ |