Commit 5b3c1184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [DCCP]: Set RTO for newly created child socket
  [DCCP]: Correctly split CCID half connections
  [NET]: Fix compat_sock_common_getsockopt typo.
  [NET]: Revert incorrect accept queue backlog changes.
  [INET]: twcal_jiffie should be unsigned long, not int
  [GIANFAR]: Fix compile error in latest git
  [PPPOE]: Use ifindex instead of device pointer in key lookups.
  [NETFILTER]: ip6_route_me_harder should take into account mark
  [NETFILTER]: nfnetlink_log: fix reference counting
  [NETFILTER]: nfnetlink_log: fix module reference counting
  [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
  [NETFILTER]: nfnetlink_log: fix NULL pointer dereference
  [NETFILTER]: nfnetlink_log: fix use after free
  [NETFILTER]: nfnetlink_log: fix reference leak
  [NETFILTER]: tcp conntrack: accept SYN|URG as valid
  [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
  [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops
parents fe1b4ba4 99c72ce0

drivers/net/gianfar.c

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static void gfar_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid) 


	spin_lock_irqsave(&priv->rxlock, flags);



	vlan_group_set_device(priv->vgrp, vid, NULL);

	vlan_group_set_device(priv->vlgrp, vid, NULL);



	spin_unlock_irqrestore(&priv->rxlock, flags);

}

drivers/net/pppoe.c

+6 −5
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static struct pppox_sock *__get_item(unsigned long sid, unsigned char *addr, int 


	ret = item_hash_table[hash];



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

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

		ret = ret->next;



	return ret;
@@ -153,7 +153,7 @@ 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_dev->ifindex == po->pppoe_dev->ifindex)

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

			return -EALREADY;



		ret = ret->next;
@@ -174,7 +174,7 @@ static struct pppox_sock *__delete_item(unsigned long sid, char *addr, int ifind 
	src = &item_hash_table[hash];



	while (ret) {

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

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

			*src = ret->next;

			break;

		}
@@ -529,7 +529,7 @@ static int pppoe_release(struct socket *sock) 


	po = pppox_sk(sk);

	if (po->pppoe_pa.sid) {

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

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

	}



	if (po->pppoe_dev)
@@ -577,7 +577,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, 
		pppox_unbind_sock(sk);



		/* Delete the old binding */

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

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



		if(po->pppoe_dev)

			dev_put(po->pppoe_dev);
@@ -597,6 +597,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, 
			goto end;



		po->pppoe_dev = dev;

		po->pppoe_ifindex = dev->ifindex;



		if (!(dev->flags & IFF_UP))

			goto err_put;

include/linux/if_pppox.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct pppoe_hdr { 
#ifdef __KERNEL__

struct pppoe_opt {

	struct net_device      *dev;	  /* device associated with socket*/

	int			ifindex;  /* ifindex of device associated with socket */

	struct pppoe_addr	pa;	  /* what this socket is bound to*/

	struct sockaddr_pppox	relay;	  /* what socket data will be

					     relayed to (PPPoE relaying) */
@@ -132,6 +133,7 @@ struct pppox_sock { 
	unsigned short		num;

};

#define pppoe_dev	proto.pppoe.dev

#define pppoe_ifindex	proto.pppoe.ifindex

#define pppoe_pa	proto.pppoe.pa

#define pppoe_relay	proto.pppoe.relay

include/linux/netfilter_ipv4/ip_conntrack_core.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static inline int ip_conntrack_confirm(struct sk_buff **pskb) 
	int ret = NF_ACCEPT;



	if (ct) {

		if (!is_confirmed(ct))

		if (!is_confirmed(ct) && !is_dying(ct))

			ret = __ip_conntrack_confirm(pskb);

		ip_ct_deliver_cached_events(ct);

	}

include/net/inet_timewait_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct inet_hashinfo; 
struct inet_timewait_death_row {

	/* Short-time timewait calendar */

	int			twcal_hand;

	int			twcal_jiffie;

	unsigned long		twcal_jiffie;

	struct timer_list	twcal_timer;

	struct hlist_head	twcal_row[INET_TWDR_RECYCLE_SLOTS];

CRA Git | Maintained and supported by SUSTech CRA and CCSE