| d5ef8a4d87ab21d575ac86366599c9152a28028d |
|
11-Feb-2012 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| dae2e9f430c46c29e3f771110094bd3da3625aa4 |
|
06-Feb-2012 |
Pradeep A. Dalvi <netdev@pradeepdalvi.com> |
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
- Removed extra skb->dev = dev after netdev_alloc_skb
Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| b530b1930bbd9d005345133f0ff0c556d2a52b19 |
|
05-Feb-2012 |
David Lv <DavidLv@viatech.com.cn> |
via-velocity: S3 resume fix.
Initially diagnosed on Ubuntu 11.04 with kernel 2.6.38.
velocity_close is not called during a suspend / resume cycle in this
driver and it has no business playing directly with power states.
Signed-off-by: David Lv <DavidLv@viatech.com.cn>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1 |
|
29-Jan-2012 |
Joe Perches <joe@perches.com> |
drivers/net: Remove alloc_etherdev error messages
alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| 8e586137e6b63af1e881b328466ab5ffbe562510 |
|
09-Dec-2011 |
Jiri Pirko <jpirko@redhat.com> |
net: make vlan ndo_vlan_rx_[add/kill]_vid return error value
Let caller know the result of adding/removing vlan id to/from vlan
filter.
In some drivers I make those functions to just return 0. But in those
where there is able to see if hw setup went correctly, return value is
set appropriately.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| 23020ab35364f2c91133b099c2b1f7458e29aa96 |
|
09-Nov-2011 |
Rick Jones <rick.jones2@hp.com> |
Sweep additional floors of strcpy in .get_drvinfo routines
Perform another round of floor sweeping, converting the .get_drvinfo
routines of additional drivers from strcpy to strlcpy along with
some conversion of sprintf to snprintf.
Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| 9e903e085262ffbf1fc44a17ac06058aca03524a |
|
18-Oct-2011 |
Eric Dumazet <eric.dumazet@gmail.com> |
net: add skb frag size accessors
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| 5d6bcdfe38ce883946aebf751a64695471ce1ab5 |
|
06-Oct-2011 |
Ian Campbell <ian.campbell@citrix.com> |
net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map
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 <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| e4cb193f79fa201c74c11a87a5beab7c08818bad |
|
21-Sep-2011 |
Ian Campbell <Ian.Campbell@citrix.com> |
via-velocity: convert to SKB paged frag API.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 |
|
20-Aug-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
|
| afc4b13df143122f99a0eb10bfefb216c2806de0 |
|
16-Aug-2011 |
Jiri Pirko <jpirko@redhat.com> |
net: remove use of ndo_set_multicast_list in drivers
replace it by ndo_set_rx_mode
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/via/via-velocity.c
|
| f2148a472883ddf77626fff52b070655a8a0a788 |
|
21-May-2011 |
Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
via-*: Move the VIA drivers
Move the VIA drivers into drivers/net/ethernet/via/ and make the
necessary Kconfig and Makefile changes.
CC: Roger Luethi <rl@hellgate.ch>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
/drivers/net/ethernet/via/via-velocity.c
|