Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aba9158 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by David S. Miller
Browse files

net: pppoe - code cleanup and helpers 



- Introduce PPPOE_HASH_MASK.
- Remove redundant declaration of pppoe_chan_ops.
- Introduce stage_session helper.
- Tabs, space, long-line-split cleanup.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2878806

drivers/net/pppoe.c

+86 −81
Original line number Diff line number Diff line
@@ -85,28 +85,39 @@ 


#define PPPOE_HASH_BITS 4

#define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)



static struct ppp_channel_ops pppoe_chan_ops;

#define PPPOE_HASH_MASK	(PPPOE_HASH_SIZE - 1)



static int pppoe_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);

static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);



static const struct proto_ops pppoe_ops;

static struct ppp_channel_ops pppoe_chan_ops;

static DEFINE_RWLOCK(pppoe_hash_lock);



static struct ppp_channel_ops pppoe_chan_ops;

/*

 * PPPoE could be in the following stages:

 * 1) Discovery stage (to obtain remote MAC and Session ID)

 * 2) Session stage (MAC and SID are known)

 *

 * Ethernet frames have a special tag for this but

 * we use simplier approach based on session id

 */

static inline bool stage_session(__be16 sid)

{

	return sid != 0;

}



static inline int cmp_2_addr(struct pppoe_addr *a, struct pppoe_addr *b)

{

	return (a->sid == b->sid &&

		(memcmp(a->remote, b->remote, ETH_ALEN) == 0));

	return a->sid == b->sid &&

		(memcmp(a->remote, b->remote, ETH_ALEN) == 0);

}



static inline int cmp_addr(struct pppoe_addr *a, __be16 sid, char *addr)

{

	return (a->sid == sid &&

		(memcmp(a->remote,addr,ETH_ALEN) == 0));

	return a->sid == sid &&

		(memcmp(a->remote, addr, ETH_ALEN) == 0);

}



#if 8 % PPPOE_HASH_BITS
@@ -118,17 +129,14 @@ static int hash_item(__be16 sid, unsigned char *addr) 
	unsigned char hash = 0;

	unsigned int i;



	for (i = 0 ; i < ETH_ALEN ; i++) {

	for (i = 0; i < ETH_ALEN; i++)

		hash ^= addr[i];

	}

	for (i = 0 ; i < sizeof(sid_t)*8 ; i += 8 ){

	for (i = 0; i < sizeof(sid_t) * 8; i += 8)

		hash ^= (__force __u32)sid >> i;

	}

	for (i = 8 ; (i>>=1) >= PPPOE_HASH_BITS ; ) {

	for (i = 8; (i >>= 1) >= PPPOE_HASH_BITS;)

		hash ^= hash >> i;

	}



	return hash & ( PPPOE_HASH_SIZE - 1 );

	return hash & PPPOE_HASH_MASK;

}



/* zeroed because its in .bss */
@@ -146,10 +154,15 @@ static struct pppox_sock *__get_item(__be16 sid, unsigned char *addr, int ifinde 


	ret = item_hash_table[hash];



	while (ret && !(cmp_addr(&ret->pppoe_pa, sid, addr) && ret->pppoe_ifindex == ifindex))

	while (ret) {

		if (cmp_addr(&ret->pppoe_pa, sid, addr) &&

		    ret->pppoe_ifindex == ifindex)

			return ret;



		ret = ret->next;

	}



	return ret;

	return NULL;

}



static int __set_item(struct pppox_sock *po)
@@ -159,7 +172,8 @@ static int __set_item(struct pppox_sock *po) 


	ret = item_hash_table[hash];

	while (ret) {

		if (cmp_2_addr(&ret->pppoe_pa, &po->pppoe_pa) && ret->pppoe_ifindex == po->pppoe_ifindex)

		if (cmp_2_addr(&ret->pppoe_pa, &po->pppoe_pa) &&

		    ret->pppoe_ifindex == po->pppoe_ifindex)

			return -EALREADY;



		ret = ret->next;
@@ -180,7 +194,8 @@ static struct pppox_sock *__delete_item(__be16 sid, char *addr, int ifindex) 
	src = &item_hash_table[hash];



	while (ret) {

		if (cmp_addr(&ret->pppoe_pa, sid, addr) && ret->pppoe_ifindex == ifindex) {

		if (cmp_addr(&ret->pppoe_pa, sid, addr) &&

		    ret->pppoe_ifindex == ifindex) {

			*src = ret->next;

			break;

		}
@@ -329,7 +344,6 @@ static struct notifier_block pppoe_notifier = { 
	.notifier_call = pppoe_device_event,

};





/************************************************************************

 *

 * Do the real work of receiving a PPPoE Session frame.
@@ -383,7 +397,8 @@ static int pppoe_rcv(struct sk_buff *skb, 
	struct pppox_sock *po;

	int len;



	if (!(skb = skb_share_check(skb, GFP_ATOMIC)))

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (!skb)

		goto out;



	if (dev_net(dev) != &init_net)
@@ -432,7 +447,8 @@ static int pppoe_disc_rcv(struct sk_buff *skb, 
	if (dev_net(dev) != &init_net)

		goto abort;



	if (!(skb = skb_share_check(skb, GFP_ATOMIC)))

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (!skb)

		goto out;



	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
@@ -493,12 +509,11 @@ static struct proto pppoe_sk_proto = { 
 **********************************************************************/

static int pppoe_create(struct net *net, struct socket *sock)

{

	int error = -ENOMEM;

	struct sock *sk;



	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppoe_sk_proto);

	if (!sk)

		goto out;

		return -ENOMEM;



	sock_init_data(sock, sk);
@@ -511,8 +526,7 @@ static int pppoe_create(struct net *net, struct socket *sock) 
	sk->sk_family	   = PF_PPPOX;

	sk->sk_protocol	   = PX_PROTO_OE;



	error = 0;

out:	return error;

	return 0;

}



static int pppoe_release(struct socket *sock)
@@ -542,7 +556,7 @@ static int pppoe_release(struct socket *sock) 
	write_lock_bh(&pppoe_hash_lock);



	po = pppox_sk(sk);

	if (po->pppoe_pa.sid) {

	if (stage_session(po->pppoe_pa.sid)) {

		__delete_item(po->pppoe_pa.sid,

			      po->pppoe_pa.remote, po->pppoe_ifindex);

	}
@@ -564,7 +578,6 @@ static int pppoe_release(struct socket *sock) 
	return 0;

}





static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,

		  int sockaddr_len, int flags)

{
@@ -582,32 +595,31 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, 


	/* Check for already bound sockets */

	error = -EBUSY;

	if ((sk->sk_state & PPPOX_CONNECTED) && sp->sa_addr.pppoe.sid)

	if ((sk->sk_state & PPPOX_CONNECTED) &&

	     stage_session(sp->sa_addr.pppoe.sid))

		goto end;



	/* Check for already disconnected sockets, on attempts to disconnect */

	error = -EALREADY;

	if ((sk->sk_state & PPPOX_DEAD) && !sp->sa_addr.pppoe.sid )

	if ((sk->sk_state & PPPOX_DEAD) &&

	     !stage_session(sp->sa_addr.pppoe.sid))

		goto end;



	error = 0;

	if (po->pppoe_pa.sid) {

		pppox_unbind_sock(sk);



	/* Delete the old binding */

	if (stage_session(po->pppoe_pa.sid)) {

		pppox_unbind_sock(sk);

		delete_item(po->pppoe_pa.sid, po->pppoe_pa.remote, po->pppoe_ifindex);



		if (po->pppoe_dev)

			dev_put(po->pppoe_dev);



		memset(sk_pppox(po) + 1, 0,

		       sizeof(struct pppox_sock) - sizeof(struct sock));



		sk->sk_state = PPPOX_NONE;

	}



	/* Don't re-bind if sid==0 */

	if (sp->sa_addr.pppoe.sid != 0) {

	/* Re-bind in session stage only */

	if (stage_session(sp->sa_addr.pppoe.sid)) {

		dev = dev_get_by_name(&init_net, sp->sa_addr.pppoe.dev);



		error = -ENODEV;
@@ -659,7 +671,6 @@ err_put: 
	goto end;

}





static int pppoe_getname(struct socket *sock, struct sockaddr *uaddr,

		  int *usockaddr_len, int peer)

{
@@ -678,7 +689,6 @@ static int pppoe_getname(struct socket *sock, struct sockaddr *uaddr, 
	return 0;

}





static int pppoe_ioctl(struct socket *sock, unsigned int cmd,

		unsigned long arg)

{
@@ -781,7 +791,6 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd, 
	return err;

}





static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,

		  struct msghdr *m, size_t total_len)

{
@@ -853,7 +862,6 @@ end: 
	return error;

}





/************************************************************************

 *

 * xmit function for internal use.
@@ -903,7 +911,6 @@ abort: 
	return 1;

}





/************************************************************************

 *

 * xmit function called by generic PPP driver
@@ -916,7 +923,6 @@ static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) 
	return __pppoe_xmit(sk, skb);

}





static struct ppp_channel_ops pppoe_chan_ops = {

	.start_xmit = pppoe_xmit,

};
@@ -976,9 +982,9 @@ out: 
static __inline__ struct pppox_sock *pppoe_get_idx(loff_t pos)

{

	struct pppox_sock *po;

	int i = 0;

	int i;



	for (; i < PPPOE_HASH_SIZE; i++) {

	for (i = 0; i < PPPOE_HASH_SIZE; i++) {

		po = item_hash_table[i];

		while (po) {

			if (!pos--)
@@ -1089,7 +1095,6 @@ static struct pppox_proto pppoe_proto = { 
	.owner	= THIS_MODULE,

};





static int __init pppoe_init(void)

{

	int err = proto_register(&pppoe_sk_proto, 0);