Commit 76a2f047 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:
  [TCP]: Fix iov_len calculation in tcp_v4_send_ack().
  [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation
  [TG3]: Add PHY workaround for 5755M.
  [BNX2]: Update version and reldate.
  [BNX2]: Fix bug in bnx2_nvram_write().
  [BNX2]: Fix 5709 Serdes detection.
  [BNX2]: Don't apply CRC PHY workaround to 5709.
  NetLabel: correct CIPSO tag handling when adding new DOI definitions
  NetLabel: correct locking in selinux_netlbl_socket_setsid()
  [Bluetooth] Correct SCO buffer for Broadcom based Dell laptops
  [Bluetooth] Correct SCO buffer for Broadcom based HP laptops
  [Bluetooth] Correct SCO buffer size for another ThinkPad laptop
  [Bluetooth] Handle device registration failures
  [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg()
  [Bluetooth] More checks if DLC is still attached to the TTY
  [Bluetooth] Add packet size checks for CAPI messages
  [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlines
  [INET]: Fix incorrect "inet_sock->is_icsk" assignment.
parents 97bee8e2 cb48cfe8

drivers/bluetooth/hci_usb.c

+7 −0
Original line number Diff line number Diff line
@@ -117,10 +117,17 @@ static struct usb_device_id blacklist_ids[] = { 


	/* IBM/Lenovo ThinkPad with Broadcom chip */

	{ USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2110), .driver_info = HCI_WRONG_SCO_MTU },



	/* ANYCOM Bluetooth USB-200 and USB-250 */

	{ USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET },



	/* HP laptop with Broadcom chip */

	{ USB_DEVICE(0x03f0, 0x171d), .driver_info = HCI_WRONG_SCO_MTU },



	/* Dell laptop with Broadcom chip */

	{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_WRONG_SCO_MTU },



	/* Microsoft Wireless Transceiver for Bluetooth 2.0 */

	{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },

drivers/net/bnx2.c

+55 −20
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.5.2"

#define DRV_MODULE_RELDATE	"December 13, 2006"

#define DRV_MODULE_VERSION	"1.5.3"

#define DRV_MODULE_RELDATE	"January 8, 2007"



#define RUN_AT(x) (jiffies + (x))
@@ -1345,8 +1345,6 @@ bnx2_init_copper_phy(struct bnx2 *bp) 
{

	u32 val;



	bp->phy_flags |= PHY_CRC_FIX_FLAG;



	if (bp->phy_flags & PHY_CRC_FIX_FLAG) {

		bnx2_write_phy(bp, 0x18, 0x0c00);

		bnx2_write_phy(bp, 0x17, 0x000a);
@@ -3085,7 +3083,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf, 
		int buf_size)

{

	u32 written, offset32, len32;

	u8 *buf, start[4], end[4], *flash_buffer = NULL;

	u8 *buf, start[4], end[4], *align_buf = NULL, *flash_buffer = NULL;

	int rc = 0;

	int align_start, align_end;
@@ -3113,16 +3111,17 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf, 
	}



	if (align_start || align_end) {

		buf = kmalloc(len32, GFP_KERNEL);

		if (buf == NULL)

		align_buf = kmalloc(len32, GFP_KERNEL);

		if (align_buf == NULL)

			return -ENOMEM;

		if (align_start) {

			memcpy(buf, start, 4);

			memcpy(align_buf, start, 4);

		}

		if (align_end) {

			memcpy(buf + len32 - 4, end, 4);

			memcpy(align_buf + len32 - 4, end, 4);

		}

		memcpy(buf + align_start, data_buf, buf_size);

		memcpy(align_buf + align_start, data_buf, buf_size);

		buf = align_buf;

	}



	if (bp->flash_info->buffered == 0) {
@@ -3256,11 +3255,8 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf, 
	}



nvram_write_end:

	if (bp->flash_info->buffered == 0)

	kfree(flash_buffer);



	if (align_start || align_end)

		kfree(buf);

	kfree(align_buf);

	return rc;

}
@@ -5645,6 +5641,44 @@ poll_bnx2(struct net_device *dev) 
}

#endif



static void __devinit

bnx2_get_5709_media(struct bnx2 *bp)

{

	u32 val = REG_RD(bp, BNX2_MISC_DUAL_MEDIA_CTRL);

	u32 bond_id = val & BNX2_MISC_DUAL_MEDIA_CTRL_BOND_ID;

	u32 strap;



	if (bond_id == BNX2_MISC_DUAL_MEDIA_CTRL_BOND_ID_C)

		return;

	else if (bond_id == BNX2_MISC_DUAL_MEDIA_CTRL_BOND_ID_S) {

		bp->phy_flags |= PHY_SERDES_FLAG;

		return;

	}



	if (val & BNX2_MISC_DUAL_MEDIA_CTRL_STRAP_OVERRIDE)

		strap = (val & BNX2_MISC_DUAL_MEDIA_CTRL_PHY_CTRL) >> 21;

	else

		strap = (val & BNX2_MISC_DUAL_MEDIA_CTRL_PHY_CTRL_STRAP) >> 8;



	if (PCI_FUNC(bp->pdev->devfn) == 0) {

		switch (strap) {

		case 0x4:

		case 0x5:

		case 0x6:

			bp->phy_flags |= PHY_SERDES_FLAG;

			return;

		}

	} else {

		switch (strap) {

		case 0x1:

		case 0x2:

		case 0x4:

			bp->phy_flags |= PHY_SERDES_FLAG;

			return;

		}

	}

}



static int __devinit

bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)

{
@@ -5865,10 +5899,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
	bp->phy_addr = 1;



	/* Disable WOL support if we are running on a SERDES chip. */

	if (CHIP_NUM(bp) == CHIP_NUM_5709) {

		if (CHIP_BOND_ID(bp) != BNX2_MISC_DUAL_MEDIA_CTRL_BOND_ID_C)

			bp->phy_flags |= PHY_SERDES_FLAG;

	} else if (CHIP_BOND_ID(bp) & CHIP_BOND_ID_SERDES_BIT)

	if (CHIP_NUM(bp) == CHIP_NUM_5709)

		bnx2_get_5709_media(bp);

	else if (CHIP_BOND_ID(bp) & CHIP_BOND_ID_SERDES_BIT)

		bp->phy_flags |= PHY_SERDES_FLAG;



	if (bp->phy_flags & PHY_SERDES_FLAG) {
@@ -5880,7 +5913,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
			if (reg & BNX2_SHARED_HW_CFG_PHY_2_5G)

				bp->phy_flags |= PHY_2_5G_CAPABLE_FLAG;

		}

	}

	} else if (CHIP_NUM(bp) == CHIP_NUM_5706 ||

		   CHIP_NUM(bp) == CHIP_NUM_5708)

		bp->phy_flags |= PHY_CRC_FIX_FLAG;



	if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||

	    (CHIP_ID(bp) == CHIP_ID_5708_B0) ||

drivers/net/tg3.c

+12 −5
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.71"

#define DRV_MODULE_RELDATE	"December 15, 2006"

#define DRV_MODULE_VERSION	"3.72"

#define DRV_MODULE_RELDATE	"January 8, 2007"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -1015,6 +1015,11 @@ out: 
	else if (tp->tg3_flags2 & TG3_FLG2_PHY_JITTER_BUG) {

		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);

		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);

		if (tp->tg3_flags2 & TG3_FLG2_PHY_ADJUST_TRIM) {

			tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b);

			tg3_writephy(tp, MII_TG3_TEST1,

				     MII_TG3_TEST1_TRIM_EN | 0x4);

		} else

			tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x010b);

		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);

	}
@@ -10803,9 +10808,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 


	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) {

		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||

		    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)

		    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) {

			tp->tg3_flags2 |= TG3_FLG2_PHY_JITTER_BUG;

		else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5906)

			if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5755M)

				tp->tg3_flags2 |= TG3_FLG2_PHY_ADJUST_TRIM;

		} else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5906)

			tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;

	}

drivers/net/tg3.h

+4 −0
Original line number Diff line number Diff line
@@ -1658,6 +1658,9 @@ 
#define MII_TG3_EPHY_TEST		0x1f /* 5906 PHY register */

#define MII_TG3_EPHY_SHADOW_EN		0x80



#define MII_TG3_TEST1			0x1e

#define MII_TG3_TEST1_TRIM_EN		0x0010



/* There are two ways to manage the TX descriptors on the tigon3.

 * Either the descriptors are in host DMA'able memory, or they

 * exist only in the cards on-chip SRAM.  All 16 send bds are under
@@ -2256,6 +2259,7 @@ struct tg3 { 
#define TG3_FLG2_1SHOT_MSI		0x10000000

#define TG3_FLG2_PHY_JITTER_BUG		0x20000000

#define TG3_FLG2_NO_FWARE_REPORTED	0x40000000

#define TG3_FLG2_PHY_ADJUST_TRIM	0x80000000



	u32				split_mode_max_reqs;

#define SPLIT_MODE_5704_MAX_REQ		3

net/bluetooth/cmtp/capi.c

+33 −6
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s 


	switch (CAPIMSG_SUBCOMMAND(skb->data)) {

	case CAPI_CONF:

		if (skb->len < CAPI_MSG_BASELEN + 10)

			break;



		func = CAPIMSG_U16(skb->data, CAPI_MSG_BASELEN + 5);

		info = CAPIMSG_U16(skb->data, CAPI_MSG_BASELEN + 8);
@@ -226,6 +229,9 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s 
			break;



		case CAPI_FUNCTION_GET_PROFILE:

			if (skb->len < CAPI_MSG_BASELEN + 11 + sizeof(capi_profile))

				break;



			controller = CAPIMSG_U16(skb->data, CAPI_MSG_BASELEN + 11);

			msgnum = CAPIMSG_MSGID(skb->data);
@@ -246,17 +252,26 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s 
			break;



		case CAPI_FUNCTION_GET_MANUFACTURER:

			if (skb->len < CAPI_MSG_BASELEN + 15)

				break;



			controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 10);



			if (!info && ctrl) {

				strncpy(ctrl->manu,

					skb->data + CAPI_MSG_BASELEN + 15,

				int len = min_t(uint, CAPI_MANUFACTURER_LEN,

						skb->data[CAPI_MSG_BASELEN + 14]);



				memset(ctrl->manu, 0, CAPI_MANUFACTURER_LEN);

				strncpy(ctrl->manu,

					skb->data + CAPI_MSG_BASELEN + 15, len);

			}



			break;



		case CAPI_FUNCTION_GET_VERSION:

			if (skb->len < CAPI_MSG_BASELEN + 32)

				break;



			controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 12);



			if (!info && ctrl) {
@@ -269,13 +284,18 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s 
			break;



		case CAPI_FUNCTION_GET_SERIAL_NUMBER:

			if (skb->len < CAPI_MSG_BASELEN + 17)

				break;



			controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 12);



			if (!info && ctrl) {

				int len = min_t(uint, CAPI_SERIAL_LEN,

						skb->data[CAPI_MSG_BASELEN + 16]);



				memset(ctrl->serial, 0, CAPI_SERIAL_LEN);

				strncpy(ctrl->serial,

					skb->data + CAPI_MSG_BASELEN + 17,

					skb->data[CAPI_MSG_BASELEN + 16]);

					skb->data + CAPI_MSG_BASELEN + 17, len);

			}



			break;
@@ -284,14 +304,18 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s 
		break;



	case CAPI_IND:

		if (skb->len < CAPI_MSG_BASELEN + 6)

			break;



		func = CAPIMSG_U16(skb->data, CAPI_MSG_BASELEN + 3);



		if (func == CAPI_FUNCTION_LOOPBACK) {

			int len = min_t(uint, skb->len - CAPI_MSG_BASELEN - 6,

						skb->data[CAPI_MSG_BASELEN + 5]);

			appl = CAPIMSG_APPID(skb->data);

			msgnum = CAPIMSG_MSGID(skb->data);

			cmtp_send_interopmsg(session, CAPI_RESP, appl, msgnum, func,

						skb->data + CAPI_MSG_BASELEN + 6,

						skb->data[CAPI_MSG_BASELEN + 5]);

						skb->data + CAPI_MSG_BASELEN + 6, len);

		}



		break;
@@ -309,6 +333,9 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb) 


	BT_DBG("session %p skb %p len %d", session, skb, skb->len);



	if (skb->len < CAPI_MSG_BASELEN)

		return;



	if (CAPIMSG_COMMAND(skb->data) == CAPI_INTEROPERABILITY) {

		cmtp_recv_interopmsg(session, skb);

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE