Commit bf603625 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:
  [ATM]: [lec] use refcnt to protect lec_arp_entries outside lock
  [ATM]: [lec] add reference counting to lec_arp entries
  [ATM]: [lec] use work queue instead of timer for lec arp expiry
  [ATM]: [lec] old_close is no longer used
  [ATM]: [lec] convert lec_arp_table to hlist
  [ATM]: [lec] header indent, comment and whitespace cleanup
  [ATM]: [lec] indent, comment and whitespace cleanup [continued]
  [ATM]: [lec] indent, comment and whitespace cleanup
  [SCTP]: Do not timestamp every SCTP packet.
  [SCTP]: Use correct mask when disabling PMTUD.
  [SCTP]: Include sk_buff overhead while updating the peer's receive window.
  [SCTP]: Enable Nagle algorithm by default.
  [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present.
  [NetLabel]: audit fixups due to delayed feedback
parents fbe96f92 6656e3c4

drivers/net/bnx2.c

+30 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.4.44"

#define DRV_MODULE_RELDATE	"August 10, 2006"

#define DRV_MODULE_VERSION	"1.4.45"

#define DRV_MODULE_RELDATE	"September 29, 2006"



#define RUN_AT(x) (jiffies + (x))
@@ -5805,6 +5805,34 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
		bp->cmd_ticks_int = bp->cmd_ticks;

	}



	/* Disable MSI on 5706 if AMD 8132 bridge is found.

	 *

	 * MSI is defined to be 32-bit write.  The 5706 does 64-bit MSI writes

	 * with byte enables disabled on the unused 32-bit word.  This is legal

	 * but causes problems on the AMD 8132 which will eventually stop

	 * responding after a while.

	 *

	 * AMD believes this incompatibility is unique to the 5706, and

	 * prefers to locally disable MSI rather than globally disabling it

	 * using pci_msi_quirk.

	 */

	if (CHIP_NUM(bp) == CHIP_NUM_5706 && disable_msi == 0) {

		struct pci_dev *amd_8132 = NULL;



		while ((amd_8132 = pci_get_device(PCI_VENDOR_ID_AMD,

						  PCI_DEVICE_ID_AMD_8132_BRIDGE,

						  amd_8132))) {

			u8 rev;



			pci_read_config_byte(amd_8132, PCI_REVISION_ID, &rev);

			if (rev >= 0x10 && rev <= 0x13) {

				disable_msi = 1;

				pci_dev_put(amd_8132);

				break;

			}

		}

	}



	bp->autoneg = AUTONEG_SPEED | AUTONEG_FLOW_CTRL;

	bp->req_line_speed = 0;

	if (bp->phy_flags & PHY_SERDES_FLAG) {

include/linux/atmlec.h

+64 −55
Original line number Diff line number Diff line 
/*

 * ATM Lan Emulation Daemon driver interface

 *

 * ATM Lan Emulation Daemon vs. driver interface

 *

 * mkiiskila@yahoo.com

 *

 * Marko Kiiskila <mkiiskila@yahoo.com>

 */



#ifndef _ATMLEC_H_
@@ -13,6 +11,7 @@ 
#include <linux/atmioc.h>

#include <linux/atm.h>

#include <linux/if_ether.h>



/* ATM lec daemon control socket */

#define ATMLEC_CTRL	_IO('a', ATMIOC_LANE)

#define ATMLEC_DATA	_IO('a', ATMIOC_LANE+1)
@@ -21,20 +20,26 @@ 
/* Maximum number of LEC interfaces (tweakable) */

#define MAX_LEC_ITF 48



/* From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring.

/*

 * From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring.

 * E.g. if MAX_LEC_ITF = 48 and NUM_TR_DEVS = 8, then lec0-lec39 are for

 * Ethernet ELANs and lec40-lec47 are for Token Ring ELANS.

 */

#define NUM_TR_DEVS 8



typedef enum {

        l_set_mac_addr,   l_del_mac_addr, 

	l_set_mac_addr,

	l_del_mac_addr,

	l_svc_setup,

        l_addr_delete,    l_topology_change, 

        l_flush_complete, l_arp_update,

	l_addr_delete,

	l_topology_change,

	l_flush_complete,

	l_arp_update,

	l_narp_req,		/* LANE2 mandates the use of this */

        l_config,         l_flush_tran_id, 

        l_set_lecid,      l_arp_xmt,

	l_config,

	l_flush_tran_id,

	l_set_lecid,

	l_arp_xmt,

	l_rdesc_arp_xmt,

	l_associate_req,

	l_should_bridge		/* should we bridge this MAC? */
@@ -63,9 +68,11 @@ struct atmlec_msg { 
		struct {

			unsigned char mac_addr[ETH_ALEN];

			unsigned char atm_addr[ATM_ESA_LEN];

                        unsigned int flag;/* Topology_change flag, 

                                              remoteflag, permanent flag,

                                              lecid, transaction id */

			unsigned int flag;	/*

						 * Topology_change flag,

						 * remoteflag, permanent flag,

						 * lecid, transaction id

						 */

			unsigned int targetless_le_arp;	/* LANE2 */

			unsigned int no_source_le_narp;	/* LANE2 */

		} normal;
@@ -75,9 +82,11 @@ struct atmlec_msg { 
			uint32_t tran_id;			/* transaction id    */

			unsigned char mac_addr[ETH_ALEN];	/* dst mac addr      */

			unsigned char atm_addr[ATM_ESA_LEN];	/* reqestor ATM addr */

                } proxy;

		     /* For mapping LE_ARP requests to responses. Filled by */

        } content;       /* zeppelin, returned by kernel. Used only when proxying */ 

		} proxy;	/*

				 * For mapping LE_ARP requests to responses. Filled by

				 * zeppelin, returned by kernel. Used only when proxying

				 */

	} content;

} __ATM_API_ALIGN;



struct atmlec_ioc {

include/linux/audit.h

+5 −6
Original line number Diff line number Diff line
@@ -95,12 +95,11 @@ 
#define AUDIT_MAC_POLICY_LOAD	1403	/* Policy file load */

#define AUDIT_MAC_STATUS	1404	/* Changed enforcing,permissive,off */

#define AUDIT_MAC_CONFIG_CHANGE	1405	/* Changes to booleans */

#define AUDIT_MAC_UNLBL_ACCEPT	1406	/* NetLabel: allow unlabeled traffic */

#define AUDIT_MAC_UNLBL_DENY	1407	/* NetLabel: deny unlabeled traffic */

#define AUDIT_MAC_CIPSOV4_ADD	1408	/* NetLabel: add CIPSOv4 DOI entry */

#define AUDIT_MAC_CIPSOV4_DEL	1409	/* NetLabel: del CIPSOv4 DOI entry */

#define AUDIT_MAC_MAP_ADD	1410	/* NetLabel: add LSM domain mapping */

#define AUDIT_MAC_MAP_DEL	1411	/* NetLabel: del LSM domain mapping */

#define AUDIT_MAC_UNLBL_ALLOW	1406	/* NetLabel: allow unlabeled traffic */

#define AUDIT_MAC_CIPSOV4_ADD	1407	/* NetLabel: add CIPSOv4 DOI entry */

#define AUDIT_MAC_CIPSOV4_DEL	1408	/* NetLabel: del CIPSOv4 DOI entry */

#define AUDIT_MAC_MAP_ADD	1409	/* NetLabel: add LSM domain mapping */

#define AUDIT_MAC_MAP_DEL	1410	/* NetLabel: del LSM domain mapping */



#define AUDIT_FIRST_KERN_ANOM_MSG   1700

#define AUDIT_LAST_KERN_ANOM_MSG    1799

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ 
#define PCI_DEVICE_ID_AMD_8151_0	0x7454

#define PCI_DEVICE_ID_AMD_8131_BRIDGE	0x7450

#define PCI_DEVICE_ID_AMD_8131_APIC	0x7451

#define PCI_DEVICE_ID_AMD_8132_BRIDGE	0x7458

#define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090

#define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091

#define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093

include/net/cipso_ipv4.h

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ extern int cipso_v4_rbm_strictvalid; 
#ifdef CONFIG_NETLABEL

int cipso_v4_doi_add(struct cipso_v4_doi *doi_def);

int cipso_v4_doi_remove(u32 doi,

			u32 audit_secid,

			struct netlbl_audit *audit_info,

			void (*callback) (struct rcu_head * head));

struct cipso_v4_doi *cipso_v4_doi_getdef(u32 doi);

int cipso_v4_doi_walk(u32 *skip_cnt,
@@ -145,7 +145,7 @@ static inline int cipso_v4_doi_add(struct cipso_v4_doi *doi_def) 
}



static inline int cipso_v4_doi_remove(u32 doi,

				    u32 audit_secid,

				    struct netlbl_audit *audit_info,

				    void (*callback) (struct rcu_head * head))

{

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE