25 May, 2012
1 commit
-
Pull more networking updates from David Miller:
"Ok, everything from here on out will be bug fixes."1) One final sync of wireless and bluetooth stuff from John Linville.
These changes have all been in his tree for more than a week, and
therefore have had the necessary -next exposure. John was just away
on a trip and didn't have a change to send the pull request until a
day or two ago.2) Put back some defines in user exposed header file areas that were
removed during the tokenring purge. From Stephen Hemminger and Paul
Gortmaker.3) A bug fix for UDP hash table allocation got lost in the pile due to
one of those "you got it.. no I've got it.." situations. :-)From Tim Bird.
4) SKB coalescing in TCP needs to have stricter checks, otherwise we'll
try to coalesce overlapping frags and crash. Fix from Eric Dumazet.5) RCU routing table lookups can race with free_fib_info(), causing
crashes when we deref the device pointers in the route. Fix by
releasing the net device in the RCU callback. From Yanmin Zhang.* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits)
tcp: take care of overlaps in tcp_try_coalesce()
ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
mm: add a low limit to alloc_large_system_hash
ipx: restore token ring define to include/linux/ipx.h
if: restore token ring ARP type to header
xen: do not disable netfront in dom0
phy/micrel: Fix ID of KSZ9021
mISDN: Add X-Tensions USB ISDN TA XC-525
gianfar:don't add FCB length to hard_header_len
Bluetooth: Report proper error number in disconnection
Bluetooth: Create flags for bt_sk()
Bluetooth: report the right security level in getsockopt
Bluetooth: Lock the L2CAP channel when sending
Bluetooth: Restore locking semantics when looking up L2CAP channels
Bluetooth: Fix a redundant and problematic incoming MTU check
Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C
Bluetooth: Fix EIR data generation for mgmt_device_found
Bluetooth: Fix Inquiry with RSSI event mask
Bluetooth: improve readability of l2cap_seq_list code
Bluetooth: Fix skb length calculation
...
23 May, 2012
3 commits
-
Pull TTY updates from Greg Kroah-Hartman:
"Here's the big TTY/serial driver pull request for the 3.5-rc1 merge
window.Nothing major in here, just lots of incremental changes from Alan and
Jiri reworking some tty core things to behave better and to get a more
solid grasp on some of the nasty tty locking issues.There are a few tty and serial driver updates in here as well.
All of this has been in the linux-next releases for a while with no
problems.Signed-off-by: Greg Kroah-Hartman "
* tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (115 commits)
serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.
serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.
serial: bfin_uart: narrow the reboot condition in DMA tx interrupt
serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.
Revert "serial_core: Update buffer overrun statistics."
tty: hvc_xen: NULL dereference on allocation failure
tty: Fix LED error return
tty: Allow uart_register/unregister/register
tty: move global ldisc idle waitqueue to the individual ldisc
serial8250-em: Add DT support
serial8250-em: clk_get() IS_ERR() error handling fix
serial_core: Update buffer overrun statistics.
tty: drop the pty lock during hangup
cris: fix missing tty arg in wait_event_interruptible_tty call
tty/amiserial: Add missing argument for tty_unlock()
tty_lock: Localise the lock
pty: Lock the devpts bits privately
tty_lock: undo the old tty_lock use on the ctty
serial8250-em: Emma Mobile UART driver V2
Add missing call to uart_update_timeout()
... -
Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
"Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.It's touches a lot of different parts of the kernel, all USB drivers,
due to some API cleanups (getting rid of the ancient err() macro) and
some changes that are needed for USB 3.0 power management updates.There are also lots of new drivers, pimarily gadget, but others as
well. We deleted a staging driver, which was nice, and finally
dropped the obsolete usbfs code, which will make Al happy to never
have to touch that again.There were some build errors in the tree that linux-next found a few
days ago, but those were fixed by the most recent changes (all were
due to us not building with CONFIG_PM disabled.)Signed-off-by: Greg Kroah-Hartman "
* tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
xhci: Fix DIV_ROUND_UP compile error.
xhci: Fix compile with CONFIG_USB_SUSPEND=n
USB: Fix core compile with CONFIG_USB_SUSPEND=n
brcm80211: Fix compile error for .disable_hub_initiated_lpm.
Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
MAINTAINERS: Add myself as maintainer to the USB PHY Layer
USB: EHCI: fix command register configuration lost problem
USB: Remove races in devio.c
USB: ehci-platform: remove update_device
USB: Disable hub-initiated LPM for comms devices.
xhci: Add Intel U1/U2 timeout policy.
xhci: Add infrastructure for host-specific LPM policies.
USB: Add macros for interrupt endpoint types.
xhci: Reserve one command for USB3 LPM disable.
xhci: Some Evaluate Context commands must succeed.
USB: Disable USB 3.0 LPM in critical sections.
USB: Add support to enable/disable USB3 link states.
USB: Allow drivers to disable hub-initiated LPM.
USB: Calculate USB 3.0 exit latencies for LPM.
USB: Refactor code to set LPM support flag.
...Conflicts:
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-universal_c210.c
drivers/net/wireless/ath/ath6kl/usb.c -
According to http://www.ip-phone-forum.de/showthread.php?t=225313 this
HW works. Thanks to Lars Immisch for pointing to this thread.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller
19 May, 2012
1 commit
-
Hub-initiated LPM is not good for USB communications devices. Comms
devices should be able to tell when their link can go into a lower power
state, because they know when an incoming transmission is finished.
Ideally, these devices would slam their links into a lower power state,
using the device-initiated LPM, after finishing the last packet of their
data transfer.If we enable the idle timeouts for the parent hubs to enable
hub-initiated LPM, we will get a lot of useless LPM packets on the bus
as the devices reject LPM transitions when they're in the middle of
receiving data. Worse, some devices might blindly accept the
hub-initiated LPM and power down their radios while they're in the
middle of receiving a transmission.The Intel Windows folks are disabling hub-initiated LPM for all USB
communications devices under a xHCI USB 3.0 host. In order to keep
the Linux behavior as close as possible to Windows, we need to do the
same in Linux.Set the disable_hub_initiated_lpm flag for for all USB communications
drivers. I know there aren't currently any USB 3.0 devices that
implement these class specifications, but we should be ready if they do.Signed-off-by: Sarah Sharp
Cc: Marcel Holtmann
Cc: Gustavo Padovan
Cc: Johan Hedberg
Cc: Hansjoerg Lipp
Cc: Tilman Schmidt
Cc: Karsten Keil
Cc: Peter Korsgaard
Cc: Jan Dumon
Cc: Petko Manolov
Cc: Steve Glendinning
Cc: "John W. Linville"
Cc: Kalle Valo
Cc: "Luis R. Rodriguez"
Cc: Jouni Malinen
Cc: Vasanthakumar Thiagarajan
Cc: Senthil Balasubramanian
Cc: Christian Lamparter
Cc: Brett Rudley
Cc: Roland Vossen
Cc: Arend van Spriel
Cc: "Franky (Zhenhui) Lin"
Cc: Kan Yan
Cc: Dan Williams
Cc: Jussi Kivilinna
Cc: Ivo van Doorn
Cc: Gertjan van Wingerde
Cc: Helmut Schaa
Cc: Herton Ronaldo Krzesinski
Cc: Hin-Tak Leung
Cc: Larry Finger
Cc: Chaoming Li
Cc: Daniel Drake
Cc: Ulrich Kunitz
Signed-off-by: Sarah Sharp
17 May, 2012
9 commits
-
We test both "!skb_out" and "skb_out" here which is duplicative and
causes a static checker warning. I considered that the intent might
have been to test "skb_in" but that's a valid pointer here.Signed-off-by: Dan Carpenter
Signed-off-by: David S. Miller -
MISDN_CTRL_RX_OFF is a meachanism to discard RX data in the driver if
the data is not needed by the application. It can be used when playing
mesages, but not recording or with unidirectional protocols.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
MISDN_CTRL_FILL_EMPTY is a meachanism to send a fixed value (normally silence)
as long no data from upper layers is available. It can be used when recording
voice messages or with unidirectional protocols.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
If the FIFO of the card is small, many short messages are queued up to
the upper layers and the userspace. This change allows the applications
to set a minimum datalen they want from the drivers.
Create a common control function to avoid code duplication in each
driver.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
We did allways allocate maxsize buffers, but for transparent data we know
the actual size.
Use a common function to calculate size and detect overflows.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
Here was a off by one in the activation/deactivation.
The additional activation in open_bchannel() did hide
it, but only if you do not try to use B2.Signed-off-by: Martin Bachem
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
If we detect the latest hardware revision we should use the bigger fifo
to avoid TX underruns and have less interrupts.
TX underruns should be logged as warning.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
It is better to send a confirm for transparent data early as possible
to avoid TX underuns.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
If a channel was closed after it was deactivated it could happen that
something was not proper resetted. The test if a channel is still activ
was wrong, so remove it and always do the cleanup.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller
16 May, 2012
1 commit
-
Correcting spelling "extenal" to "external" in hfcmulti.c
Signed-off-by: Masanari Iida
08 May, 2012
8 commits
-
If Kernel CAPI is compiled without CONFIG_ISDN_CAPI_MIDDLEWARE,
the structure retrieved via capincci_find() is never actually
used, so don't compile that function in that case.Signed-off-by: Tilman Schmidt
Signed-off-by: David S. Miller -
Fix up some of the readibility deterioration caused by the recent
whitespace coding style cleanup.Signed-off-by: Tilman Schmidt
Signed-off-by: David S. Miller -
Various functions in the Gigaset driver were using different
conventions for the meaning of their int return values.
Align them to the usual negative error numbers convention.Inspired-by: Julia Lawall
Signed-off-by: Tilman Schmidt
Signed-off-by: David S. Miller -
Functions clear_at_state and free_strings did the same thing;
drop one of them, keeping the more descriptive name.
Drop a redundant call.
Rename function dealloc_at_states to dealloc_temp_at_states
to clarify its purpose.Signed-off-by: Tilman Schmidt
Signed-off-by: David S. Miller -
Fix up some of the readibility deterioration caused by the recent
whitespace coding style cleanup.Signed-off-by: Tilman Schmidt
Signed-off-by: David S. Miller -
An out-of-place "OK" response to the "AT+GMR" (get firmware version)
command turns out to be, more often than not, a delayed response to
a previous command rather than an actual error, so continue waiting
for the version number in that case.Signed-off-by: Tilman Schmidt
CC: stable
Signed-off-by: David S. Miller -
If DISCONNECT_B3_IND was synthesized because of a DISCONNECT_REQ
with existing logical connections, the connection state wasn't
updated accordingly. Also the emitted DISCONNECT_B3_IND message
wasn't included in the debug log as requested.
This patch fixes both of these issues.Signed-off-by: Tilman Schmidt
CC: stable
Signed-off-by: David S. Miller -
Introduce a global ratelimit for CAPI message dumps to protect
against possible log flood.
Drop the ratelimit for ignored messages which is now covered by the
global one.Signed-off-by: Tilman Schmidt
CC: stable
Signed-off-by: David S. Miller
04 May, 2012
6 commits
-
With multiple cards is hard to figure out which port caused trouble
int the layer2 routines (e.g. got a timeout).
Now we have the informations in the log output.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
The timer3 and the activation delay timer need to be independent.
If timer3 fires do not reqest power up we have to send only INFO 0.
Now layer1 pass TBR3 again.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
For certification test it is very useful to change the layer1
timer3 value on runtime.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
To be full preemptiv safe, we cannot handle a L2 timeout in the timer
context itself, we should do all actions via the D-channel thread.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
Under some configs it was still not possible to unload the driver,
because the module use count was srewed up.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
Tei manager reports current layer 1 state on creation.
On state change it reports it to the socket interface.Signed-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller
27 Apr, 2012
1 commit
-
Remove the custom DIVA_{INIT,EXIT}_FUNCTION defines and use
the standard __init,__exit markup.Signed-off-by: H Hartley Sweeten
Cc: Armin Schindler
Cc: Karsten Keil
Signed-off-by: David S. Miller
26 Apr, 2012
8 commits
-
Fragmentation is usefull if multiple devices are connected to an E1
interface. Each fragment will have a subset of the available timeslots.
These devices require a cascde connection or a multiplexer.Signed-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
LEDs will show RED if layer 1 is disabled or fails.
LEDs will show GREEN if layer 1 is active.
LEDs will blink if traffic on D-channel.Signed-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
We already have the flag for L1 active, so we should use it.
L2 will be solved in a later patch.Signed-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
Transmitted audio data was interrupted if a bridge was enabled or disabled.
Now transmission seamlessly continues during that action.
Fix in hfcmulti.koSigned-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
dsp_spl_jiffies need to be the same datatype as jiffies (which is ulong).
If not, on 64 bit systems it will fallback to schedule the DSP every jiffie
tic as soon jiffies become > 2^32.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
If DTMF debug is set and tresh goes under 100, the printk will cause
a division by zero.Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
In some cases the hardware bridging/conference (2-n parties) was selected,
but still pure software bridging/conference was used.Signed-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller -
Fix a bug (was introduced by a cut & paste error)
in cases when dsp->conf was NULL.Signed-off-by: Andreas Eversberg
Signed-off-by: Karsten Keil
Signed-off-by: David S. Miller
24 Apr, 2012
1 commit
-
Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")The former moved around the sysctl register/unregister calls, the
later simply removed them.With help from Stephen Rothwell.
Signed-off-by: David S. Miller
19 Apr, 2012
1 commit
-
This allows us to pick up some changes needed for other serial patches.
Signed-off-by: Greg Kroah-Hartman
