linux.git/drivers/net/ethernet/sun, branch v3.2

sunhme: Allow usage on SBI based SBus systems

2011-11-08T19:01:42+00:00

To prevent the SBus driver for Sun Happy Meal cards from being loaded for
PCI cards utilizing the same chipset, a filter was added to the probe
function in commit 0b492fce3d72d982a7981905f85484a1e1ba7fde.

The filter was implemented by checking the name of the parent node in
the OF tree. This patch extends this filter, so that the driver will
load on SBus systems that are based upon SBI SBus Bridges.

Signed-off-by: Kjetil Oftedal 
Signed-off-by: David S. Miller

net: add skb frag size accessors

2011-10-19T07:10:46+00:00

To ease skb->truesize sanitization, its better to be able to localize
all references to skb frags size.

Define accessors : skb_frag_size() to fetch frag size, and
skb_frag_size_{set|add|sub}() to manipulate it.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

niu: fix skb truesize underestimation

2011-10-14T02:25:21+00:00

Add a 'truesize' argument to niu_rx_skb_append(), filled with rcr_size
by the caller to properly account frag sizes in skb->truesize

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map

2011-10-06T20:17:20+00:00

When I converted some drivers from pci_map_page to skb_frag_dma_map I
neglected to convert PCI_DMA_xDEVICE into DMA_x_DEVICE and
pci_dma_mapping_error into dma_mapping_error.

Signed-off-by: Ian Campbell 
Signed-off-by: David S. Miller

sunhme: convert to SKB paged frag API.

2011-09-22T20:04:16+00:00

Signed-off-by: Ian Campbell 
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller

sungem: convert to SKB paged frag API.

2011-09-22T20:04:16+00:00

Signed-off-by: Ian Campbell 
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller

Merge branch 'master' of github.com:davem330/net

2011-09-22T07:23:13+00:00

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

ethtool: Update ethtool_rxnfc::rule_cnt on return from ETHTOOL_GRXCLSRLALL

2011-09-16T23:25:10+00:00

A user-space process must use ETHTOOL_GRXCLSRLCNT to find the number
of classification rules, then allocate a buffer of the right size,
then use ETHTOOL_GRXCLSRLALL to fill the buffer.  If some other
process inserts or deletes a rule between those two operations,
the user buffer might turn out to be the wrong size.

If it's too small, the return value will be -EMSGSIZE.  But if it's
too large, there is no indication of this.  Fix this by updating
the rule_cnt field on return.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

ethtool: Clean up definitions of rule location arrays in RX NFC

2011-09-16T23:25:10+00:00

Correct the description of ethtool_rxnfc::rule_locs; it is an array
of currently used locations, not all possible valid locations.

Add note that drivers must not use ethtool_rxnfc::rule_locs.

The rule_locs argument to ethtool_ops::get_rxnfc is either NULL or a
pointer to an array of u32, so change the parameter type accordingly.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

Merge branch 'master' of ../netdev-next/

2011-09-16T06:58:54+00:00