Commit e5b26a88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://github.com/davem330/net 

* git://github.com/davem330/net: (27 commits)
  xfrm: Perform a replay check after return from async codepaths
  fib:fix BUG_ON in fib_nl_newrule when add new fib rule
  ixgbe: fix possible null buffer error
  tg3: fix VLAN tagging regression
  net: pxa168: Fix build errors by including interrupt.h
  netconsole: switch init_netconsole() to late_initcall
  gianfar: Fix overflow check and return value for gfar_get_cls_all()
  ppp_generic: fix multilink fragment MTU calculation (again)
  GRETH: avoid overwrite IP-stack's IP-frags checksum
  GRETH: RX/TX bytes were never increased
  ipv6: fix a possible double free
  b43: Fix beacon problem in ad-hoc mode
  Bluetooth: add support for 2011 mac mini
  Bluetooth: Add MacBookAir4,1 support
  Bluetooth: Fixed BT ST Channel reg order
  r8169: do not enable the TBI for anything but the original 8169.
  r8169: remove erroneous processing of always set bit.
  r8169: fix WOL setting for 8105 and 8111evl
  r8169: add MODULE_FIRMWARE for the firmware of 8111evl
  r8169: fix the reset setting for 8111evl
  ...
parents fed678dc bcf66bf5

drivers/bluetooth/btusb.c

+6 −0
Original line number Diff line number Diff line
@@ -72,9 +72,15 @@ static struct usb_device_id btusb_table[] = { 
	/* Apple MacBookAir3,1, MacBookAir3,2 */

	{ USB_DEVICE(0x05ac, 0x821b) },



	/* Apple MacBookAir4,1 */

	{ USB_DEVICE(0x05ac, 0x821f) },



	/* Apple MacBookPro8,2 */

	{ USB_DEVICE(0x05ac, 0x821a) },



	/* Apple MacMini5,1 */

	{ USB_DEVICE(0x05ac, 0x8281) },



	/* AVM BlueFRITZ! USB v2.0 */

	{ USB_DEVICE(0x057c, 0x3800) },

drivers/bluetooth/btwilink.c

+8 −8
Original line number Diff line number Diff line
@@ -124,6 +124,13 @@ static long st_receive(void *priv_data, struct sk_buff *skb) 
/* ------- Interfaces to HCI layer ------ */

/* protocol structure registered with shared transport */

static struct st_proto_s ti_st_proto[MAX_BT_CHNL_IDS] = {

	{

		.chnl_id = HCI_EVENT_PKT, /* HCI Events */

		.hdr_len = sizeof(struct hci_event_hdr),

		.offset_len_in_hdr = offsetof(struct hci_event_hdr, plen),

		.len_size = 1, /* sizeof(plen) in struct hci_event_hdr */

		.reserve = 8,

	},

	{

		.chnl_id = HCI_ACLDATA_PKT, /* ACL */

		.hdr_len = sizeof(struct hci_acl_hdr),
@@ -138,13 +145,6 @@ static struct st_proto_s ti_st_proto[MAX_BT_CHNL_IDS] = { 
		.len_size = 1, /* sizeof(dlen) in struct hci_sco_hdr */

		.reserve = 8,

	},

	{

		.chnl_id = HCI_EVENT_PKT, /* HCI Events */

		.hdr_len = sizeof(struct hci_event_hdr),

		.offset_len_in_hdr = offsetof(struct hci_event_hdr, plen),

		.len_size = 1, /* sizeof(plen) in struct hci_event_hdr */

		.reserve = 8,

	},

};



/* Called from HCI core to initialize the device */
@@ -240,7 +240,7 @@ static int ti_st_close(struct hci_dev *hdev) 
	if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))

		return 0;



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

	for (i = MAX_BT_CHNL_IDS-1; i >= 0; i--) {

		err = st_unregister(&ti_st_proto[i]);

		if (err)

			BT_ERR("st_unregister(%d) failed with error %d",

drivers/net/gianfar_ethtool.c

+4 −4
Original line number Diff line number Diff line
@@ -1669,11 +1669,11 @@ static int gfar_get_cls_all(struct gfar_private *priv, 
	u32 i = 0;



	list_for_each_entry(comp, &priv->rx_list.list, list) {

		if (i <= cmd->rule_cnt) {

		if (i == cmd->rule_cnt)

			return -EMSGSIZE;

		rule_locs[i] = comp->fs.location;

		i++;

	}

	}



	cmd->data = MAX_FILER_IDX;

drivers/net/greth.c

+10 −2
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ greth_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	dma_sync_single_for_device(greth->dev, dma_addr, skb->len, DMA_TO_DEVICE);



	status = GRETH_BD_EN | GRETH_BD_IE | (skb->len & GRETH_BD_LEN);

	greth->tx_bufs_length[greth->tx_next] = skb->len & GRETH_BD_LEN;



	/* Wrap around descriptor ring */

	if (greth->tx_next == GRETH_TXBD_NUM_MASK) {
@@ -490,6 +491,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) 
	if (nr_frags != 0)

		status = GRETH_TXBD_MORE;



	if (skb->ip_summed == CHECKSUM_PARTIAL)

		status |= GRETH_TXBD_CSALL;

	status |= skb_headlen(skb) & GRETH_BD_LEN;

	if (greth->tx_next == GRETH_TXBD_NUM_MASK)
@@ -513,7 +515,9 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) 
		greth->tx_skbuff[curr_tx] = NULL;

		bdp = greth->tx_bd_base + curr_tx;



		status = GRETH_TXBD_CSALL | GRETH_BD_EN;

		status = GRETH_BD_EN;

		if (skb->ip_summed == CHECKSUM_PARTIAL)

			status |= GRETH_TXBD_CSALL;

		status |= frag->size & GRETH_BD_LEN;



		/* Wrap around descriptor ring */
@@ -641,6 +645,7 @@ static void greth_clean_tx(struct net_device *dev) 
				dev->stats.tx_fifo_errors++;

		}

		dev->stats.tx_packets++;

		dev->stats.tx_bytes += greth->tx_bufs_length[greth->tx_last];

		greth->tx_last = NEXT_TX(greth->tx_last);

		greth->tx_free++;

	}
@@ -695,6 +700,7 @@ static void greth_clean_tx_gbit(struct net_device *dev) 
		greth->tx_skbuff[greth->tx_last] = NULL;



		greth_update_tx_stats(dev, stat);

		dev->stats.tx_bytes += skb->len;



		bdp = greth->tx_bd_base + greth->tx_last;
@@ -796,6 +802,7 @@ static int greth_rx(struct net_device *dev, int limit) 
				memcpy(skb_put(skb, pkt_len), phys_to_virt(dma_addr), pkt_len);



				skb->protocol = eth_type_trans(skb, dev);

				dev->stats.rx_bytes += pkt_len;

				dev->stats.rx_packets++;

				netif_receive_skb(skb);

			}
@@ -910,6 +917,7 @@ static int greth_rx_gbit(struct net_device *dev, int limit) 


				skb->protocol = eth_type_trans(skb, dev);

				dev->stats.rx_packets++;

				dev->stats.rx_bytes += pkt_len;

				netif_receive_skb(skb);



				greth->rx_skbuff[greth->rx_cur] = newskb;

drivers/net/greth.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct greth_private { 


	unsigned char *tx_bufs[GRETH_TXBD_NUM];

	unsigned char *rx_bufs[GRETH_RXBD_NUM];

	u16 tx_bufs_length[GRETH_TXBD_NUM];



	u16 tx_next;

	u16 tx_last;

CRA Git | Maintained and supported by SUSTech CRA and CCSE