aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-12igb: fix ethtool offline testJeff Kirsher1-0/+7
A bug was introduced with the following patch: Commmit bdbc063129e811264cd6c311d8c2d9b95de01231 Author: Eric Dumazet <[email protected]> igb: Add support for byte queue limits. The ethtool offline tests will cause a perpetual link flap, this is because the tests also need to account for byte queue limits (BQL). CC: Eric Dumazet <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: John Fastabend <[email protected]> Tested-by: Jeff Pieper <[email protected]>
2012-03-12bnx2x: code doesn't use stats for allocating Rx BDsDmitry Kravkov1-8/+9
Previously, allocation used queue statistics directly in its calcualtion. This change causes these calculations to be summed into the statistics, without being affected by them. Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: ethtool returns req. AN even when AN failsYuval Mintz1-1/+1
Previously, if autoneg failed, ethtool would return the achieved autoneg. This patch corrects this, causing ethtool to return the requested autoneg capabilities even if autoneg fails. Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: ethtool now returns unknown speed/duplexYuval Mintz1-11/+18
Previously, unless both interface and link were up, ethtool returned the requested speed/duplex when asked for the interface's settings. This change will now enable the driver to answer correctly (i.e., return unknown as its answer). Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: mark functions as loaded on shared memoryYuval Mintz1-0/+17
This change enables the FW to make more accurate decisions regarding the active functions. Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: use param's id instead of sp_obj's idYuval Mintz3-1/+5
Previously, we've used the object's function id instead of using the input's value. This is remedied, as in other flows. Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: set_one_mac_e1x uses raw's state as inputYuval Mintz1-1/+1
Previously, we used a hard-coded value as paramater, instead of using the input's value. This is now remedied, as in other flows. Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: removed unused function bnx2x_queue_set_cos_cidYuval Mintz1-7/+0
Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12bnx2x: move LLH_CAM to header, apply naming conventionsYuval Mintz2-9/+11
These definitions are united into the header. Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12lpc32xx: Added ethernet driver[email protected]5-0/+1615
This patch adds an ethernet driver for the LPC32xx ARM SoC. Signed-off-by: Roland Stigge <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12net/hyperv: Add support for vlan trunking from guestsHaiyang Zhang4-4/+101
With this feature, a Linux guest can now configure multiple vlans through a single synthetic NIC on Win8 Hyper-V host. Signed-off-by: Haiyang Zhang <[email protected]> Reviewed-by: K. Y. Srinivasan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12net/hyperv: Fix data corruption in rndis_filter_receive()Haiyang Zhang1-24/+9
Limiting the memcpy to be the sizeof(struct rndis_message) can truncate the message if there are Per-Packet-Info or Out-of-Band data. In my earlier patch (commit 45326342), the unnecessary kmap_atomic and kunmap_atomic surrounding this memcpy have been removed because the memory in the receive buffer is always mapped. This memcpy is not necessary either. To fix the bug, I removed the memcpy. Signed-off-by: Haiyang Zhang <[email protected]> Reviewed-by: K. Y. Srinivasan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-12net: ipv4: Standardize prefixes for message loggingJoe Perches20-50/+81
Add #define pr_fmt(fmt) as appropriate. Add "IPv4: ", "TCP: ", and "IPsec: " to appropriate files. Standardize on "UDPLite: " for appropriate uses. Some prefixes were previously "UDPLITE: " and "UDP-Lite: ". Add KBUILD_MODNAME ": " to icmp and gre. Remove embedded prefixes as appropriate. Add missing "\n" to pr_info in gre.c. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11net: Convert printks to pr_<level>Joe Perches25-181/+163
Use a more current kernel messaging style. Convert a printk block to print_hex_dump. Coalesce formats, align arguments. Use %s, __func__ instead of embedding function names. Some messages that were prefixed with <foo>_close are now prefixed with <foo>_fini. Some ah4 and esp messages are now not prefixed with "ip ". The intent of this patch is to later add something like #define pr_fmt(fmt) "IPv4: " fmt. to standardize the output messages. Text size is trivially reduced. (x86-32 allyesconfig) $ size net/ipv4/built-in.o* text data bss dec hex filename 887888 31558 249696 1169142 11d6f6 net/ipv4/built-in.o.new 887934 31558 249800 1169292 11d78c net/ipv4/built-in.o.old Signed-off-by: Joe Perches <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11net: get rid of some pointless casts to sockaddrMaciej Żenczykowski5-27/+19
The following 4 functions: move_addr_to_kernel move_addr_to_user verify_iovec verify_compat_iovec are always effectively called with a sockaddr_storage. Make this explicit by changing their signature. This removes a large number of casts from sockaddr_storage to sockaddr. Signed-off-by: Maciej Żenczykowski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11ipv6: Fix Smatch warning.Li Wei1-1/+1
With commit d6ddef9e641d(IPv6: Fix not join all-router mcast group when forwarding set.) I check 'dev' after it's dereference that leads to a Smatch complaint: net/ipv6/addrconf.c:438 ipv6_add_dev() warn: variable dereferenced before check 'dev' (see line 432) net/ipv6/addrconf.c 431 /* protected by rtnl_lock */ 432 rcu_assign_pointer(dev->ip6_ptr, ndev); ^^^^^^^^^^^^ Old dereference. 433 434 /* Join all-node multicast group */ 435 ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes); 436 437 /* Join all-router multicast group if forwarding is set */ 438 if (ndev->cnf.forwarding && dev && (dev->flags & IFF_MULTICAST)) ^^^ Remove the check to avoid the complaint as 'dev' can't be NULL. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Li Wei <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11MAINTAINERS: add an entry for the PHC codeRichard Cochran1-0/+11
Some months ago, tglx asked me off list if I would maintain the PTP Hardware Clock code. Since then, the code has been fully merged, and I am actively looking after it. This patch makes it official. Signed-off-by: Richard Cochran <[email protected]> Acked-by: John Stultz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11r8169: enable transmit time stamping.Richard Cochran1-0/+2
This patch has been tested on a machine with the Realtek RTL8101E/RTL8102E PCI Express Fast Ethernet controller (rev 05). Cc: Realtek linux nic maintainers <[email protected]> Cc: Francois Romieu <[email protected]> Signed-off-by: Richard Cochran <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11drivers/net/irda/{ali-ircc, via-ircc, w83977af-ir}.c: ensure arguments to ↵Julia Lawall3-4/+4
request_irq and free_irq are compatible Convert calls to free_irq so that the second argument is the same as the last argument of the corresponding call to request_irq. Without this property, free_irq does nothing. Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11drivers/atm/eni.c: ensure arguments to request_irq and free_irq are compatibleJulia Lawall1-1/+1
Convert calls to free_irq so that the second argument is the same as the last argument of the corresponding call to request_irq. Without this property, free_irq does nothing. Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11caif: make zero a legal caif connetion id.[email protected]1-3/+6
Connection ID configured through RTNL must allow zero as connection id. If connection-id is not given when creating the interface, configure a loopback interface using ifindex as connection-id. Signed-off-by: Sjur Brændeland <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11caif: Fix for a race in socket transmit with flow control.Dmitry Tarnyagin6-24/+31
Kill faulty checks on flow-off leading to connection drop at race conditions. caif_socket checks for flow-on before transmitting and goes to sleep or return -EAGAIN upon flow stop. Remove faulty subsequent checks on flow-off leading to connection drop. Also fix memory leaks on some of the errors paths. Signed-off-by: Sjur Brændeland <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-11Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller14-194/+145
2012-03-11Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linuxDavid S. Miller1-500/+476
2012-03-11batman-adv: Remove spaces after a castSven Eckelmann2-3/+3
Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-03-11batman-adv: Use {} braces consistent on the arms of a statementSven Eckelmann1-1/+2
Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-03-11batman-adv: Don't begin block comments with only a /* lineSven Eckelmann2-13/+3
Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-03-11batman-adv: Ignore 80-chars per line limits for stringsSven Eckelmann12-177/+137
Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-03-10r8169: stop using net_device.{base_addr, irq}.Francois Romieu1-7/+5
The driver does not need this leftover of the ISA drivers era. Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move rtl_cfg_info closer to its caller.Francois Romieu1-61/+57
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move the netpoll handler after the irq handler.Francois Romieu1-11/+9
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move rtl8169_open after rtl_task it depends on.Francois Romieu1-87/+81
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move rtl_set_rx_mode before its rtl_hw_start callers.Francois Romieu1-51/+50
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move net_device_ops beyond the methods it references.Francois Romieu1-29/+20
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move the driver probe method to the end of the driver file.Francois Romieu1-246/+246
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-10r8169: move the driver removal method to the end of the driver file.Francois Romieu1-29/+29
Signed-off-by: Francois Romieu <[email protected]> Cc: Hayes Wang <[email protected]>
2012-03-09net: powerpc: remove the legacy iSeries ethernet driverStephen Rothwell3-1713/+0
This driver is specific to the PowerPC legcay iSeries platform which is being removed. Cc: David Miller <[email protected]> Cc: <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]> Acked-by: David S. Miller <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-03-09Merge branch 'for-davem' of ↵David S. Miller11-103/+222
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
2012-03-09ptp_pch: rename pch_pcidev to pci_driver to fix section mismatch warnings.David S. Miller1-3/+3
Signed-off-by: David S. Miller <[email protected]>
2012-03-09net: Use bool in netdevice.h helpers.David S. Miller1-26/+26
Specifically use it in napi_disable_pending(), napi_schedule_prep(), napi_reschedule(), netif_tx_queue_stopped(), netif_queue_stopped(), netif_xmit_stopped(), netif_xmit_frozen_or_stopped(), netif_running(), __netif_subqueue_stopped(), netif_subqueue_stopped(), netif_is_multiquue(), netif_carrier_ok(), netif_dormant(), netif_oper_up(), netif_device_present(), __netif_tx_trylock(), net_gso_ok(), skb_gso_ok(), netif_needs_gso(), and netif_is_bond_slave(). Signed-off-by: David S. Miller <[email protected]>
2012-03-09net: Use bool in skbuff.h helper functions.David S. Miller1-3/+3
In particular do this for skb_is_nonlinear(), skb_is_gso(), and skb_is_gso_v6(). Signed-off-by: David S. Miller <[email protected]>
2012-03-09ipv4: Make ip_rcv_options() return bool.David S. Miller1-3/+3
Signed-off-by: David S. Miller <[email protected]>
2012-03-09ipv4: Make ip_call_ra_chain() return bool.David S. Miller2-5/+5
Signed-off-by: David S. Miller <[email protected]>
2012-03-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller119-265/+648
2012-03-09net/pch_gbe: supports eg20t ptp clockTakahiroi Shimizu3-3/+240
Supports EG20T ptp clock in the driver Changes e-mail address. Adds number. Signed-off-by: Takahiro Shimizu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-09supports eg20t ptp clockTakahiro Shimizu3-0/+744
Supports EG20T ptp clock in the driver Changes e-mail address. Adds number. Signed-off-by: Takahiro Shimizu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-09x86: Derandom delay_tsc for 64 bitThomas Gleixner1-2/+2
Commit f0fbf0abc093 ("x86: integrate delay functions") converted delay_tsc() into a random delay generator for 64 bit. The reason is that it merged the mostly identical versions of delay_32.c and delay_64.c. Though the subtle difference of the result was: static void delay_tsc(unsigned long loops) { - unsigned bclock, now; + unsigned long bclock, now; Now the function uses rdtscl() which returns the lower 32bit of the TSC. On 32bit that's not problematic as unsigned long is 32bit. On 64 bit this fails when the lower 32bit are close to wrap around when bclock is read, because the following check if ((now - bclock) >= loops) break; evaluated to true on 64bit for e.g. bclock = 0xffffffff and now = 0 because the unsigned long (now - bclock) of these values results in 0xffffffff00000001 which is definitely larger than the loops value. That explains Tvortkos observation: "Because I am seeing udelay(500) (_occasionally_) being short, and that by delaying for some duration between 0us (yep) and 491us." Make those variables explicitely u32 again, so this works for both 32 and 64 bit. Reported-by: Tvrtko Ursulin <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] # >= 2.6.27 Signed-off-by: Linus Torvalds <[email protected]>
2012-03-09Merge tag 'sound-fixes' of ↵Linus Torvalds3-2/+20
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "Nothing exciting here: just a few regression fixes for HD-audio and ASoC, also the support of missing 32bit compat ioctl for HDSPM." * tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hdspm - Provide ioctl_compat ALSA: hda/realtek - Apply the coef-setup only to ALC269VB ALSA: hda - add quirk to detect CD input on Gigabyte EP45-DS3 ASoC: neo1973: fix neo1973 wm8753 initialization
2012-03-09MAINTAINERS: new git entry for arm/mach-msmDavid Brown1-1/+1
The msm git tree moved to git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git Signed-off-by: David Brown <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-03-09Merge branch 'master' of ↵John W. Linville166-4874/+6183
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Powered by cgit, Gruvboxed by Blaster4385.