Commit 626db29f 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:
  [TG3]: Disable TSO on 5906 if CLKREQ is enabled.
  [TCP]: Fix up sysctl_tcp_mem initialization.
  [NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr()
  [NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
  [NETFILTER]: Use pskb_trim in {ip,ip6,nfnetlink}_queue
  [NETFILTER]: nfnetlink_log: fix byteorder of NFULA_SEQ_GLOBAL
  [TG3]: Increase 5906 firmware poll time.
parents b342baa7 c7835a77

drivers/net/tg3.c

+19 −6
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.68"

#define DRV_MODULE_RELDATE	"November 02, 2006"

#define DRV_MODULE_VERSION	"3.69"

#define DRV_MODULE_RELDATE	"November 15, 2006"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -4728,10 +4728,11 @@ static int tg3_poll_fw(struct tg3 *tp) 
	u32 val;



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {

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

		/* Wait up to 20ms for init done. */

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

			if (tr32(VCPU_STATUS) & VCPU_STATUS_INIT_DONE)

				return 0;

			udelay(10);

			udelay(100);

		}

		return -ENODEV;

	}
@@ -10365,7 +10366,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	u32 pci_state_reg, grc_misc_cfg;

	u32 val;

	u16 pci_cmd;

	int err;

	int err, pcie_cap;



	/* Force memory write invalidate off.  If we leave it on,

	 * then on 5700_BX chips we have to enable a workaround.
@@ -10540,8 +10541,19 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5906)

		tp->tg3_flags2 |= TG3_FLG2_JUMBO_CAPABLE;



	if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)

	pcie_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_EXP);

	if (pcie_cap != 0) {

		tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;

		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {

			u16 lnkctl;



			pci_read_config_word(tp->pdev,

					     pcie_cap + PCI_EXP_LNKCTL,

					     &lnkctl);

			if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN)

				tp->tg3_flags2 &= ~TG3_FLG2_HW_TSO_2;

		}

	}



	/* If we have an AMD 762 or VIA K8T800 chipset, write

	 * reordering to the mailbox registers done by the host
@@ -11808,6 +11820,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
	else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||

	    tp->pci_chip_rev_id == CHIPREV_ID_5705_A0 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906 ||

	    (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0) {

		tp->tg3_flags2 &= ~TG3_FLG2_TSO_CAPABLE;

	} else {

include/linux/in6.h

+11 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ struct in6_flowlabel_req 
#endif



/*

 * Netfilter

 * Netfilter (1)

 *

 * Following socket options are used in ip6_tables;

 * see include/linux/netfilter_ipv6/ip6_tables.h.
@@ -240,4 +240,14 @@ struct in6_flowlabel_req 
#define IPV6_RECVTCLASS		66

#define IPV6_TCLASS		67



/*

 * Netfilter (2)

 *

 * Following socket options are used in ip6_tables;

 * see include/linux/netfilter_ipv6/ip6_tables.h.

 *

 * IP6T_SO_GET_REVISION_MATCH	68

 * IP6T_SO_GET_REVISION_TARGET	69

 */



#endif

include/linux/netfilter/x_tables.h

+0 −16
Original line number Diff line number Diff line
@@ -96,22 +96,6 @@ struct _xt_align 
/* Error verdict. */

#define XT_ERROR_TARGET "ERROR"



/*

 * New IP firewall options for [gs]etsockopt at the RAW IP level.

 * Unlike BSD Linux inherits IP options so you don't have to use a raw

 * socket for this. Instead we check rights in the calls. */

#define XT_BASE_CTL		64	/* base for firewall socket options */



#define XT_SO_SET_REPLACE	(XT_BASE_CTL)

#define XT_SO_SET_ADD_COUNTERS	(XT_BASE_CTL + 1)

#define XT_SO_SET_MAX		XT_SO_SET_ADD_COUNTERS



#define XT_SO_GET_INFO			(XT_BASE_CTL)

#define XT_SO_GET_ENTRIES		(XT_BASE_CTL + 1)

#define XT_SO_GET_REVISION_MATCH	(XT_BASE_CTL + 2)

#define XT_SO_GET_REVISION_TARGET	(XT_BASE_CTL + 3)

#define XT_SO_GET_MAX			XT_SO_GET_REVISION_TARGET



#define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)

#define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)

include/linux/netfilter_arp/arp_tables.h

+13 −12
Original line number Diff line number Diff line
@@ -112,19 +112,20 @@ struct arpt_entry 
 * New IP firewall options for [gs]etsockopt at the RAW IP level.

 * Unlike BSD Linux inherits IP options so you don't have to use a raw

 * socket for this. Instead we check rights in the calls.

 *

 * ATTENTION: check linux/in.h before adding new number here.

 */

#define ARPT_CTL_OFFSET		32

#define ARPT_BASE_CTL		(XT_BASE_CTL+ARPT_CTL_OFFSET)



#define ARPT_SO_SET_REPLACE		(XT_SO_SET_REPLACE+ARPT_CTL_OFFSET)

#define ARPT_SO_SET_ADD_COUNTERS	(XT_SO_SET_ADD_COUNTERS+ARPT_CTL_OFFSET)

#define ARPT_SO_SET_MAX			(XT_SO_SET_MAX+ARPT_CTL_OFFSET)



#define ARPT_SO_GET_INFO		(XT_SO_GET_INFO+ARPT_CTL_OFFSET)

#define ARPT_SO_GET_ENTRIES		(XT_SO_GET_ENTRIES+ARPT_CTL_OFFSET)

/* #define ARPT_SO_GET_REVISION_MATCH	XT_SO_GET_REVISION_MATCH  */

#define ARPT_SO_GET_REVISION_TARGET	(XT_SO_GET_REVISION_TARGET+ARPT_CTL_OFFSET)

#define ARPT_SO_GET_MAX			(XT_SO_GET_REVISION_TARGET+ARPT_CTL_OFFSET)

#define ARPT_BASE_CTL		96



#define ARPT_SO_SET_REPLACE		(ARPT_BASE_CTL)

#define ARPT_SO_SET_ADD_COUNTERS	(ARPT_BASE_CTL + 1)

#define ARPT_SO_SET_MAX			ARPT_SO_SET_ADD_COUNTERS



#define ARPT_SO_GET_INFO		(ARPT_BASE_CTL)

#define ARPT_SO_GET_ENTRIES		(ARPT_BASE_CTL + 1)

/* #define ARPT_SO_GET_REVISION_MATCH	(APRT_BASE_CTL + 2) */

#define ARPT_SO_GET_REVISION_TARGET	(ARPT_BASE_CTL + 3)

#define ARPT_SO_GET_MAX			(ARPT_SO_GET_REVISION_TARGET)



/* CONTINUE verdict for targets */

#define ARPT_CONTINUE XT_CONTINUE

include/linux/netfilter_ipv4/ip_tables.h

+15 −12
Original line number Diff line number Diff line
@@ -101,18 +101,21 @@ struct ipt_entry 
/*

 * New IP firewall options for [gs]etsockopt at the RAW IP level.

 * Unlike BSD Linux inherits IP options so you don't have to use a raw

 * socket for this. Instead we check rights in the calls. */

#define IPT_BASE_CTL		XT_BASE_CTL



#define IPT_SO_SET_REPLACE	XT_SO_SET_REPLACE

#define IPT_SO_SET_ADD_COUNTERS	XT_SO_SET_ADD_COUNTERS

#define IPT_SO_SET_MAX		XT_SO_SET_MAX



#define IPT_SO_GET_INFO			XT_SO_GET_INFO

#define IPT_SO_GET_ENTRIES		XT_SO_GET_ENTRIES

#define IPT_SO_GET_REVISION_MATCH	XT_SO_GET_REVISION_MATCH

#define IPT_SO_GET_REVISION_TARGET	XT_SO_GET_REVISION_TARGET

#define IPT_SO_GET_MAX			XT_SO_GET_REVISION_TARGET

 * socket for this. Instead we check rights in the calls.

 *

 * ATTENTION: check linux/in.h before adding new number here.

 */

#define IPT_BASE_CTL		64



#define IPT_SO_SET_REPLACE	(IPT_BASE_CTL)

#define IPT_SO_SET_ADD_COUNTERS	(IPT_BASE_CTL + 1)

#define IPT_SO_SET_MAX		IPT_SO_SET_ADD_COUNTERS



#define IPT_SO_GET_INFO			(IPT_BASE_CTL)

#define IPT_SO_GET_ENTRIES		(IPT_BASE_CTL + 1)

#define IPT_SO_GET_REVISION_MATCH	(IPT_BASE_CTL + 2)

#define IPT_SO_GET_REVISION_TARGET	(IPT_BASE_CTL + 3)

#define IPT_SO_GET_MAX			IPT_SO_GET_REVISION_TARGET



#define IPT_CONTINUE XT_CONTINUE

#define IPT_RETURN XT_RETURN

CRA Git | Maintained and supported by SUSTech CRA and CCSE