[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:
@@ -625,7 +625,7 @@ static const struct nla_policy dn_ifa_policy[IFA_MAX+1] = {
|
||||
|
||||
static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
|
||||
{
|
||||
struct net *net = skb->sk->sk_net;
|
||||
struct net *net = sock_net(skb->sk);
|
||||
struct nlattr *tb[IFA_MAX+1];
|
||||
struct dn_dev *dn_db;
|
||||
struct ifaddrmsg *ifm;
|
||||
@@ -663,7 +663,7 @@ errout:
|
||||
|
||||
static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
|
||||
{
|
||||
struct net *net = skb->sk->sk_net;
|
||||
struct net *net = sock_net(skb->sk);
|
||||
struct nlattr *tb[IFA_MAX+1];
|
||||
struct net_device *dev;
|
||||
struct dn_dev *dn_db;
|
||||
@@ -779,7 +779,7 @@ errout:
|
||||
|
||||
static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
{
|
||||
struct net *net = skb->sk->sk_net;
|
||||
struct net *net = sock_net(skb->sk);
|
||||
int idx, dn_idx = 0, skip_ndevs, skip_naddr;
|
||||
struct net_device *dev;
|
||||
struct dn_dev *dn_db;
|
||||
|
Reference in New Issue
Block a user