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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  be2net: Fix to avoid a crash seen on PPC with LRO and Jumbo frames.
  gro: Flush GRO packets in napi_disable_pending path
  inet: Call skb_orphan before tproxy activates
  mac80211: Use rcu_barrier() on unload.
  sunrpc: Use rcu_barrier() on unload.
  bridge: Use rcu_barrier() instead of syncronize_net() on unload.
  ipv6: Use rcu_barrier() on module unload.
  decnet: Use rcu_barrier() on module unload.
  sky2: Fix checksum endianness
  mdio add missing GPL flag
  sh_eth: remove redundant test on unsigned
  fsl_pq_mdio: Fix fsl_pq_mdio to work with modules
  ipv6: avoid wraparound for expired preferred lifetime
  tcp: missing check ACK flag of received segment in FIN-WAIT-2 state
  atl1*: add device_set_wakeup_enable to atl1*_set_wol
  Phonet: generate Netlink RTM_DELADDR when destroying a device
  Phonet: publicize the Netlink notification function
  Revert "veth: prevent oops caused by netdev destructor"
  cpmac: fix compilation failure introduced with netdev_ops conversion
  ipsec: Fix name of CAST algorithm
parents 9a8fb9ee bd46cb6c

drivers/net/atl1c/atl1c_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ static int atl1c_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & WAKE_PHY)

		adapter->wol |= AT_WUFC_LNKC;



	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);



	return 0;

}

drivers/net/atl1e/atl1e_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & WAKE_PHY)

		adapter->wol |= AT_WUFC_LNKC;



	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);



	return 0;

}

drivers/net/benet/be.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline char *nic_name(struct pci_dev *pdev) 
#define RX_FRAGS_REFILL_WM	(RX_Q_LEN - MAX_RX_POST)



#define BE_MAX_LRO_DESCRIPTORS  16

#define BE_MAX_FRAGS_PER_FRAME  16

#define BE_MAX_FRAGS_PER_FRAME  (min((u32) 16, (u32) MAX_SKB_FRAGS))



struct be_dma_mem {

	void *va;

drivers/net/benet/be_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) 
		return -EINVAL;



	adapter->max_rx_coal = coalesce->rx_max_coalesced_frames;

	if (adapter->max_rx_coal > MAX_SKB_FRAGS)

		adapter->max_rx_coal = MAX_SKB_FRAGS - 1;

	if (adapter->max_rx_coal > BE_MAX_FRAGS_PER_FRAME)

		adapter->max_rx_coal = BE_MAX_FRAGS_PER_FRAME;



	/* if AIC is being turned on now, start with an EQD of 0 */

	if (rx_eq->enable_aic == 0 &&

drivers/net/benet/be_main.c

+32 −13
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, 
{

	struct be_queue_info *rxq = &adapter->rx_obj.q;

	struct be_rx_page_info *page_info;

	u16 rxq_idx, i, num_rcvd;

	u16 rxq_idx, i, num_rcvd, j;

	u32 pktsize, hdr_len, curr_frag_len;

	u8 *start;
@@ -709,22 +709,33 @@ static void skb_fill_rx_data(struct be_adapter *adapter, 


	/* More frags present for this completion */

	pktsize -= curr_frag_len; /* account for above copied frag */

	for (i = 1; i < num_rcvd; i++) {

	for (i = 1, j = 0; i < num_rcvd; i++) {

		index_inc(&rxq_idx, rxq->len);

		page_info = get_rx_page_info(adapter, rxq_idx);



		curr_frag_len = min(pktsize, rx_frag_size);



		skb_shinfo(skb)->frags[i].page = page_info->page;

		skb_shinfo(skb)->frags[i].page_offset = page_info->page_offset;

		skb_shinfo(skb)->frags[i].size = curr_frag_len;

		/* Coalesce all frags from the same physical page in one slot */

		if (page_info->page_offset == 0) {

			/* Fresh page */

			j++;

			skb_shinfo(skb)->frags[j].page = page_info->page;

			skb_shinfo(skb)->frags[j].page_offset =

							page_info->page_offset;

			skb_shinfo(skb)->frags[j].size = 0;

			skb_shinfo(skb)->nr_frags++;

		} else {

			put_page(page_info->page);

		}



		skb_shinfo(skb)->frags[j].size += curr_frag_len;

		skb->len += curr_frag_len;

		skb->data_len += curr_frag_len;

		skb_shinfo(skb)->nr_frags++;

		pktsize -= curr_frag_len;



		memset(page_info, 0, sizeof(*page_info));

	}

	BUG_ON(j > MAX_SKB_FRAGS);



done:

	be_rx_stats_update(adapter, pktsize, num_rcvd);
@@ -786,7 +797,7 @@ static void be_rx_compl_process_lro(struct be_adapter *adapter, 
	struct skb_frag_struct rx_frags[BE_MAX_FRAGS_PER_FRAME];

	struct be_queue_info *rxq = &adapter->rx_obj.q;

	u32 num_rcvd, pkt_size, remaining, vlanf, curr_frag_len;

	u16 i, rxq_idx = 0, vid;

	u16 i, rxq_idx = 0, vid, j;



	num_rcvd = AMAP_GET_BITS(struct amap_eth_rx_compl, numfrags, rxcp);

	pkt_size = AMAP_GET_BITS(struct amap_eth_rx_compl, pktsize, rxcp);
@@ -794,20 +805,28 @@ static void be_rx_compl_process_lro(struct be_adapter *adapter, 
	rxq_idx = AMAP_GET_BITS(struct amap_eth_rx_compl, fragndx, rxcp);



	remaining = pkt_size;

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

	for (i = 0, j = -1; i < num_rcvd; i++) {

		page_info = get_rx_page_info(adapter, rxq_idx);



		curr_frag_len = min(remaining, rx_frag_size);



		rx_frags[i].page = page_info->page;

		rx_frags[i].page_offset = page_info->page_offset;

		rx_frags[i].size = curr_frag_len;

		remaining -= curr_frag_len;

		/* Coalesce all frags from the same physical page in one slot */

		if (i == 0 || page_info->page_offset == 0) {

			/* First frag or Fresh page */

			j++;

			rx_frags[j].page = page_info->page;

			rx_frags[j].page_offset = page_info->page_offset;

			rx_frags[j].size = 0;

		} else {

			put_page(page_info->page);

		}

		rx_frags[j].size += curr_frag_len;



		remaining -= curr_frag_len;

		index_inc(&rxq_idx, rxq->len);



		memset(page_info, 0, sizeof(*page_info));

	}

	BUG_ON(j > MAX_SKB_FRAGS);



	if (likely(!vlanf)) {

		lro_receive_frags(&adapter->rx_obj.lro_mgr, rx_frags, pkt_size,

CRA Git | Maintained and supported by SUSTech CRA and CCSE