diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-03-11 23:06:44 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-12 14:39:40 -0400 |
| commit | 0c5c9fb55106333e773de8c9dd321fa8240caeb3 (patch) | |
| tree | da550b771a52ba583eb97c1ad00fffbf3ae17f73 /net/packet | |
| parent | net: Kill hold_net release_net (diff) | |
| download | linux-dev-0c5c9fb55106333e773de8c9dd321fa8240caeb3.tar.xz linux-dev-0c5c9fb55106333e773de8c9dd321fa8240caeb3.zip | |
net: Introduce possible_net_t
Having to say
> #ifdef CONFIG_NET_NS
> struct net *net;
> #endif
in structures is a little bit wordy and a little bit error prone.
Instead it is possible to say:
> typedef struct {
> #ifdef CONFIG_NET_NS
> struct net *net;
> #endif
> } possible_net_t;
And then in a header say:
> possible_net_t net;
Which is cleaner and easier to use and easier to test, as the
possible_net_t is always there no matter what the compile options.
Further this allows read_pnet and write_pnet to be functions in all
cases which is better at catching typos.
This change adds possible_net_t, updates the definitions of read_pnet
and write_pnet, updates optional struct net * variables that
write_pnet uses on to have the type possible_net_t, and finally fixes
up the b0rked users of read_pnet and write_pnet.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/internal.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/packet/internal.h b/net/packet/internal.h index cdddf6a30399..fe6e20caea1d 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h @@ -74,9 +74,7 @@ extern struct mutex fanout_mutex; #define PACKET_FANOUT_MAX 256 struct packet_fanout { -#ifdef CONFIG_NET_NS - struct net *net; -#endif + possible_net_t net; unsigned int num_members; u16 id; u8 type; |