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

Commit 92e52b2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 03c6b749 ca933452

drivers/net/tg3.c

+8 −8
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.34"

#define DRV_MODULE_RELDATE	"July 25, 2005"

#define DRV_MODULE_VERSION	"3.35"

#define DRV_MODULE_RELDATE	"August 6, 2005"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -10421,6 +10421,12 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 


	tg3_init_coal(tp);



	/* Now that we have fully setup the chip, save away a snapshot

	 * of the PCI config space.  We need to restore this after

	 * GRC_MISC_CFG core clock resets and some resume events.

	 */

	pci_save_state(tp->pdev);



	err = register_netdev(dev);

	if (err) {

		printk(KERN_ERR PFX "Cannot register net device, "
@@ -10430,12 +10436,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 


	pci_set_drvdata(pdev, dev);



	/* Now that we have fully setup the chip, save away a snapshot

	 * of the PCI config space.  We need to restore this after

	 * GRC_MISC_CFG core clock resets and some resume events.

	 */

	pci_save_state(tp->pdev);



	printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (PCI%s:%s:%s) %sBaseT Ethernet ",

	       dev->name,

	       tp->board_part_number,

include/linux/netlink.h

+1 −3
Original line number Diff line number Diff line
@@ -12,15 +12,13 @@ 
#define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */

#define NETLINK_XFRM		6	/* ipsec */

#define NETLINK_SELINUX		7	/* SELinux event notifications */

#define NETLINK_ARPD		8

#define NETLINK_ISCSI		8	/* Open-iSCSI */

#define NETLINK_AUDIT		9	/* auditing */

#define NETLINK_FIB_LOOKUP	10	

#define NETLINK_ROUTE6		11	/* af_inet6 route comm channel */

#define NETLINK_NETFILTER	12	/* netfilter subsystem */

#define NETLINK_IP6_FW		13

#define NETLINK_DNRTMSG		14	/* DECnet routing messages */

#define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */

#define NETLINK_TAPBASE		16	/* 16 to 31 are ethertap */



#define MAX_LINKS 32

net/ipv4/icmp.c

+1 −2
Original line number Diff line number Diff line
@@ -936,8 +936,7 @@ int icmp_rcv(struct sk_buff *skb) 
	case CHECKSUM_HW:

		if (!(u16)csum_fold(skb->csum))

			break;

		NETDEBUG(if (net_ratelimit())

				printk(KERN_DEBUG "icmp v4 hw csum failure\n"));

		LIMIT_NETDEBUG(printk(KERN_DEBUG "icmp v4 hw csum failure\n"));

	case CHECKSUM_NONE:

		if ((u16)csum_fold(skb_checksum(skb, 0, skb->len, 0)))

			goto error;

net/ipv4/ip_fragment.c

+3 −5
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user) 
	return ip_frag_intern(hash, qp);



out_nomem:

	NETDEBUG(if (net_ratelimit()) printk(KERN_ERR "ip_frag_create: no memory left !\n"));

	LIMIT_NETDEBUG(printk(KERN_ERR "ip_frag_create: no memory left !\n"));

	return NULL;

}
@@ -625,10 +625,8 @@ static struct sk_buff *ip_frag_reasm(struct ipq *qp, struct net_device *dev) 
	return head;



out_nomem:

 	NETDEBUG(if (net_ratelimit())

	         printk(KERN_ERR 

			"IP: queue_glue: no memory for gluing queue %p\n",

			qp));

 	LIMIT_NETDEBUG(printk(KERN_ERR "IP: queue_glue: no memory for gluing "

			      "queue %p\n", qp));

	goto out_fail;

out_oversize:

	if (net_ratelimit())

net/ipv4/ip_sockglue.c

+3 −0
Original line number Diff line number Diff line
@@ -848,6 +848,9 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, 
 

		case IP_IPSEC_POLICY:

		case IP_XFRM_POLICY:

			err = -EPERM;

			if (!capable(CAP_NET_ADMIN))

				break;

			err = xfrm_user_policy(sk, optname, optval, optlen);

			break;