[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.
Introduce per-sock inlines: sock_net(), sock_net_set() and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set(). Without CONFIG_NET_NS, no namespace other than &init_net exists. Let's explicitly define them to help compiler optimizations. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
This commit is contained in:
@ -364,7 +364,7 @@ static const struct nla_policy ifal_policy[IFAL_MAX+1] = {
|
||||
static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||
void *arg)
|
||||
{
|
||||
struct net *net = skb->sk->sk_net;
|
||||
struct net *net = sock_net(skb->sk);
|
||||
struct ifaddrlblmsg *ifal;
|
||||
struct nlattr *tb[IFAL_MAX+1];
|
||||
struct in6_addr *pfx;
|
||||
@ -452,7 +452,7 @@ static int ip6addrlbl_fill(struct sk_buff *skb,
|
||||
|
||||
static int ip6addrlbl_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
{
|
||||
struct net *net = skb->sk->sk_net;
|
||||
struct net *net = sock_net(skb->sk);
|
||||
struct ip6addrlbl_entry *p;
|
||||
struct hlist_node *pos;
|
||||
int idx = 0, s_idx = cb->args[0];
|
||||
@ -490,7 +490,7 @@ static inline int ip6addrlbl_msgsize(void)
|
||||
static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr* nlh,
|
||||
void *arg)
|
||||
{
|
||||
struct net *net = in_skb->sk->sk_net;
|
||||
struct net *net = sock_net(in_skb->sk);
|
||||
struct ifaddrlblmsg *ifal;
|
||||
struct nlattr *tb[IFAL_MAX+1];
|
||||
struct in6_addr *addr;
|
||||
|
Reference in New Issue
Block a user