Commit c5dd2733 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]: Add missing unlock in tg3_open() error path.
  [IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
  [IRDA]: Lockdep fix.
  [BLUETOOTH]: Fix unaligned access in hci_send_to_sock.
  [XFRM]: nlmsg length not computed correctly in the presence of subpolicies
  [XFRM]: Sub-policies broke policy events
  [IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
  [Bluetooth] Ignore L2CAP config requests on disconnect
  [Bluetooth] Always include MTU in L2CAP config responses
  [Bluetooth] Check if RFCOMM session is still attached to the TTY
  [Bluetooth] Handling pending connect attempts after inquiry
  [Bluetooth] Attach low-level connections to the Bluetooth bus
  [IPV6] IP6TUNNEL: Add missing nf_reset() on input path.
  [IPV6] IP6TUNNEL: Delete all tunnel device when unloading module.
  [IPV6] ROUTE: Do not enable router reachability probing in router mode.
  [IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
  [IPV6] ROUTE: Try to use router which is not known unreachable.
parents 6af6e1ef 12862086

drivers/net/tg3.c

+3 −1
Original line number Diff line number Diff line
@@ -6979,8 +6979,10 @@ static int tg3_open(struct net_device *dev) 
	tg3_full_lock(tp, 0);



	err = tg3_set_power_state(tp, PCI_D0);

	if (err)

	if (err) {

		tg3_full_unlock(tp);

		return err;

	}



	tg3_disable_ints(tp);

	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;

include/linux/igmp.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct ip_mc_list 
#define IGMPV3_MASK(value, nb) ((nb)>=32 ? (value) : ((1<<(nb))-1) & (value))

#define IGMPV3_EXP(thresh, nbmant, nbexp, value) \

	((value) < (thresh) ? (value) : \

        ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant+nbexp))) << \

        ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant))) << \

         (IGMPV3_MASK((value) >> (nbmant), nbexp) + (nbexp))))



#define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value)

net/bluetooth/hci_event.c

+19 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
static void hci_cc_link_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb)

{

	__u8 status;

	struct hci_conn *pend;



	BT_DBG("%s ocf 0x%x", hdev->name, ocf);
@@ -71,6 +72,15 @@ static void hci_cc_link_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb 
			clear_bit(HCI_INQUIRY, &hdev->flags);

			hci_req_complete(hdev, status);

		}



		hci_dev_lock(hdev);



		pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);

		if (pend)

			hci_acl_connect(pend);



		hci_dev_unlock(hdev);



		break;



	default:
@@ -565,11 +575,20 @@ static void hci_cs_info_param(struct hci_dev *hdev, __u16 ocf, __u8 status) 
static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

{

	__u8 status = *((__u8 *) skb->data);

	struct hci_conn *pend;



	BT_DBG("%s status %d", hdev->name, status);



	clear_bit(HCI_INQUIRY, &hdev->flags);

	hci_req_complete(hdev, status);



	hci_dev_lock(hdev);



	pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);

	if (pend)

		hci_acl_connect(pend);



	hci_dev_unlock(hdev);

}



/* Inquiry Result */

net/bluetooth/hci_sock.c

+7 −4
Original line number Diff line number Diff line
@@ -120,10 +120,13 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) 
			if (!hci_test_bit(evt, &flt->event_mask))

				continue;



			if (flt->opcode && ((evt == HCI_EV_CMD_COMPLETE && 

					flt->opcode != *(__u16 *)(skb->data + 3)) ||

			if (flt->opcode &&

			    ((evt == HCI_EV_CMD_COMPLETE &&

			      flt->opcode !=

			      get_unaligned((__u16 *)(skb->data + 3))) ||

			     (evt == HCI_EV_CMD_STATUS &&

					flt->opcode != *(__u16 *)(skb->data + 4))))

			      flt->opcode !=

			      get_unaligned((__u16 *)(skb->data + 4)))))

				continue;

		}

net/bluetooth/hci_sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -259,7 +259,9 @@ void hci_conn_add_sysfs(struct hci_conn *conn) 


	BT_DBG("conn %p", conn);



	conn->dev.bus = &bt_bus;

	conn->dev.parent = &hdev->dev;



	conn->dev.release = bt_release;



	snprintf(conn->dev.bus_id, BUS_ID_SIZE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE