|
@@ -411,7 +411,6 @@ static int tipc_sk_sock_err(struct socket *sock, long *timeout)
|
|
|
static int tipc_sk_create(struct net *net, struct socket *sock,
|
|
|
int protocol, int kern)
|
|
|
{
|
|
|
- struct tipc_net *tn;
|
|
|
const struct proto_ops *ops;
|
|
|
struct sock *sk;
|
|
|
struct tipc_sock *tsk;
|
|
@@ -446,7 +445,6 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
|
|
|
INIT_LIST_HEAD(&tsk->publications);
|
|
|
INIT_LIST_HEAD(&tsk->cong_links);
|
|
|
msg = &tsk->phdr;
|
|
|
- tn = net_generic(sock_net(sk), tipc_net_id);
|
|
|
|
|
|
/* Finish initializing socket data structures */
|
|
|
sock->ops = ops;
|
|
@@ -1117,7 +1115,7 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq,
|
|
|
u32 self = tipc_own_addr(net);
|
|
|
u32 type, lower, upper, scope;
|
|
|
struct sk_buff *skb, *_skb;
|
|
|
- u32 portid, oport, onode;
|
|
|
+ u32 portid, onode;
|
|
|
struct sk_buff_head tmpq;
|
|
|
struct list_head dports;
|
|
|
struct tipc_msg *hdr;
|
|
@@ -1133,7 +1131,6 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq,
|
|
|
user = msg_user(hdr);
|
|
|
mtyp = msg_type(hdr);
|
|
|
hlen = skb_headroom(skb) + msg_hdr_sz(hdr);
|
|
|
- oport = msg_origport(hdr);
|
|
|
onode = msg_orignode(hdr);
|
|
|
type = msg_nametype(hdr);
|
|
|
|