24 Feb, 2011
15 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
Added support for usb ethernet (0x0fe6, 0x9700)
r8169: fix RTL8168DP power off issue.
r8169: correct settings of rtl8102e.
r8169: fix incorrect args to oob notify.
DM9000B: Fix PHY power for network down/up
DM9000B: Fix reg_save after spin_lock in dm9000_timeout
net_sched: long word align struct qdisc_skb_cb data
sfc: lower stack usage in efx_ethtool_self_test
bridge: Use IPv6 link-local address for multicast listener queries
bridge: Fix MLD queries' ethernet source address
bridge: Allow mcast snooping for transient link local addresses too
ipv6: Add IPv6 multicast address flag defines
bridge: Add missing ntohs()s for MLDv2 report parsing
bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report
bridge: Fix IPv6 multicast snooping by storing correct protocol type
p54pci: update receive dma buffers before and after processing
fix cfg80211_wext_siwfreq lock ordering...
rt2x00: Fix WPA TKIP Michael MIC failures.
ath5k: Fix fast channel switching
tcp: undo_retrans counter fixes
... -
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
amd64-agp: fix crash at second module load
drm/radeon: fix regression with AA resolve checking
drm: drop commented out code and preceding comment
drm/vblank: Enable precise vblank timestamps for interlaced and doublescan modes.
drm/vblank: Use memory barriers optimized for atomic_t instead of generics.
drm/vblank: Use abs64(diff_ns) for s64 diff_ns instead of abs(diff_ns)
drm/radeon/kms: align height of fb allocation.
Revert "drm/radeon/kms: switch back to min->max pll post divider iteration" -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: serio/gameport - use 'long' system workqueue
Input: synaptics - document 0x0c query
Input: tegra-kbc - add function keymap -
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: check if device support discard in xfs_ioc_trim()
xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1 -
The device is very similar to (0x0fe6, 0x8101),
And works well with dm9601 driver.Signed-off-by: Shahar Havivi
Acked-by: Peter Korsgaard
Signed-off-by: David S. Miller -
- fix the RTL8111DP turn off the power when DASH is enabled.
- RTL_GIGA_MAC_VER_27 must wait for tx finish before reset.Signed-off-by: Hayes Wang
Acked-by: Francois Romieu -
Adjust and remove certain settings of RTL8102E which are for previous chips.
Signed-off-by: Hayes Wang
Acked-off-by: Francois Romieu -
It results in the wrong point address and influences RTL8168DP.
Signed-off-by: Hayes Wang
Acked-by: Francois Romieu -
DM9000 revision B needs 1 ms delay after PHY power-on.
PHY must be powered on by writing 0 into register DM9000_GPR before
all other settings will change (see Davicom spec and example code).Remember, that register DM9000_GPR was not changed by reset sequence.
Without this fix the FIFO is out of sync and sends wrong data after
sequence of "ifconfig ethX down ; ifconfig ethX up".Signed-off-by: David S. Miller
-
The spin_lock should hold before reading register.
Signed-off-by: David S. Miller
-
netem_skb_cb() does :
return (struct netem_skb_cb *)qdisc_skb_cb(skb)->data;
Unfortunatly struct qdisc_skb_cb data is not long word aligned, so
access to psched_time_t time_to_send uses a non aligned access.Signed-off-by: Eric Dumazet
Signed-off-by: David S. Miller -
Commit 8ee294cd9def0004887da7f44b80563493b0a097 converted serio
subsystem event handling from using a dedicated thread to using
common workqueue. Unfortunately, this regressed our boot times,
due to the fact that serio jobs take long time to execute. While
the new concurrency managed workqueue code manages long-playing
works just fine and schedules additional workers as needed, such
works wreck havoc among remaining users of flush_scheduled_work().To solve this problem let's move serio/gameport works from system_wq
to system_long_wq which nobody tries to flush.Reported-and-tested-by: Hernando Torque
Acked-by: Tejun Heo
Signed-off-by: Dmitry Torokhov -
Since Synaptics technical writers department is a bit slow releasing updated
Synaptics interface guide, let's add some new bits (with their blessing)
to the code so that they don't get lost.Signed-off-by: Dmitry Torokhov
-
The __param section is already brought in by RODATA above.
Signed-off-by: Jesper Nilsson
Signed-off-by: Linus Torvalds
23 Feb, 2011
25 commits
-
The module forgot to sometimes unregister some resources.
This fixes Bug #22882.
[Patch updated to 2.6.38-rc3 by Randy Dunlap.]
Tested-by: Randy Dunlap
Signed-off-by: Florian Mickler
Signed-off-by: Dave Airlie -
* 'for-2639-rc4/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
i2c-omap: fixup commit cb527ede1bf6ff2008a025606f25344b8ed7b4ac whitespace
i2c-omap: Double clear of ARDY status in IRQ handler
i2c-omap: fix build for !CONFIG_SUSPEND
i2c-omap: fix static suspend vs. runtime suspend
i2c-stu300: make sure adapter-name is terminated -
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
Revert "USB: Reset USB 3.0 devices on (re)discovery"
USB: musb: omap2430: fix kernel panic on reboot
sierra: add new ID for Airprime/Sierra USB IP modem
USB: serial/usb_wwan, fix tty NULL dereference
USB: Reset USB 3.0 devices on (re)discovery
USB: Add quirk for Samsung Android phone modem
USB: Add Samsung SGH-I500/Android modem ID switch to visor driver
USB: add quirks entry for Keytouch QWERTY Panel
usb: musb: omap2430: fix kernel panic on reboot
usb: musb: fix build breakage -
Fixup the whitespace error noticed in cb527ede1bf6ff2008a025606f25344b8ed7b4ac
Signed-off-by: Ben Dooks
-
This errata occurs when the ARDY interrupt generation is enabled.
At the begining of every new transaction the ARDY interrupt is cleared.On continuous i2c transactions where after clearing the ARDY bit from
I2C_STAT register (clearing the interrupt), the IRQ line is reasserted and the
I2C_STAT[ARDY] bit set again on 1. In fact, the ARDY status bit is not cleared
at the write access to I2C_STAT[ARDY] and only the IRQ line is deasserted and
then reasserted. This is not captured in the usual errata documents.The workaround is to have a double clear of ARDY status in irq handler.
Signed-off-by: Richard woodruff
Signed-off-by: Keerthy
Signed-off-by: Ben Dooks -
fix the build break when !CONFIG_SUSPEND
drivers/i2c/busses/i2c-omap.c:1173: error: lvalue required as unary '&' operand
make[3]: *** [drivers/i2c/busses/i2c-omap.o] Error 1
make[2]: *** [drivers/i2c/busses] Error 2
make[1]: *** [drivers/i2c] Error 2
make: *** [drivers] Error 2Signed-off-by: Balaji T K
Signed-off-by: Ben Dooks -
Some userspaces can emit a whole packet without disabling AA resolve
by the looks of it, so we have to deal with them.Signed-off-by: Dave Airlie
Tested-by: Jorg Otte -
r100_gpu_init() was dropped in 90aca4d ("drm/radeon/kms: simplify &
improve GPU reset V2") but here it was only commented out.Signed-off-by: Paul Bolle
Signed-off-by: Dave Airlie -
Testing showed the current code can already handle doublescan
video modes just fine. A trivial tweak makes it work for interlaced
scanout as well.Tested and shown to be precise on Radeon rv530, r600 and
Intel 945-GME.Signed-off-by: Mario Kleiner
Signed-off-by: Dave Airlie -
Documentation/atomic_ops.txt tells us that there are memory
barriers optimized for atomic_inc and other atomic_t ops.Use these instead of smp_wmb(), and also to make the required
memory barriers around vblank counter increments more explicit.Signed-off-by: Mario Kleiner
Signed-off-by: Dave Airlie -
Use of abs() wrongly wrapped diff_ns to 32 bit, which gives a 1/4000
probability of a missed vblank increment at each vblank irq reenable
if the kms driver doesn't support high precision vblank timestamping.
Not a big deal in practice, but let's make it nice.Signed-off-by: Mario Kleiner
Signed-off-by: Dave Airlie -
this aligns the height of the fb allocation so it doesn't trip
over the size checks later when we use this from userspace to
copy the buffer at X start.Signed-off-by: Dave Airlie
-
This reverts commit a6f9761743bf35b052180f4a8bdae4d2cc0465f6.
Remove this commit as it is no longer necessary. The relevant bugs
were fixed properly in:
drm/radeon/kms: hopefully fix pll issues for real (v3)
5b40ddf888398ce4cccbf3b9d0a18d90149ed7ff
drm/radeon/kms: add missing frac fb div flag for dce4+
9f4283f49f0a96a64c5a45fe56f0f8c942885eefThis commit also broke certain ~5 Mhz modes on old arcade monitors,
so reverting this commit fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=29502Signed-off-by: Alex Deucher
Cc: stable@kernel.org
Signed-off-by: Dave Airlie -
When runtime PM is enabled, each OMAP i2c device is suspended after
each i2c xfer. However, there are two cases when the static suspend
methods must be used to ensure the devices are suspended:1) runtime PM is disabled, either at compile time or dynamically
via /sys/devices/.../power/control.
2) an i2c client driver uses i2c during it's suspend callback, thus
leaving the i2c driver active (NOTE: runtime suspend transitions are
disabled during system suspend, so i2c activity during system
suspend will runtime resume the device, but not runtime (re)suspend it.)Since the actual work to suspend the device is handled by the
subsytem, call the bus methods to take care of it.NOTE: This takes care of a known suspend problem on OMAP3 where the
TWL RTC driver does i2c xfers during its suspend path leaving the i2c
driver in an active state (since runtime suspend transistions are
disabled.)Signed-off-by: Kevin Hilman
Signed-off-by: Ben Dooks -
Use strlcpy instead of strncpy.
Signed-off-by: Wolfram Sang
Cc: Linus Walleij
Cc: Ben Dooks
Signed-off-by: Ben Dooks -
Right now we, are relying on the fact that when we attempt to
actually do the discard, blkdev_issue_discar() returns -EOPNOTSUPP
and the user is informed that the device does not support discard.However, in the case where the we do not hit any suitable free
extent to trim in FITRIM code, it will finish without any error.
This is very confusing, because it seems that FITRIM was successful
even though the device does not actually supports discard.Solution: Check for the discard support before attempt to search for
free extents.Signed-off-by: Lukas Czerner
Signed-off-by: Alex Elder -
The FSGEOMETRY_V1 ioctl (and its compat equivalent) calls out to
xfs_fs_geometry() with a version number of 3. This code path does not
fill in the logsunit member of the passed xfs_fsop_geom_t, leading to
the leaking of four bytes of uninitialized stack data to potentially
unprivileged callers.v2 switches to memset() to avoid future issues if structure members
change, on suggestion of Dave Chinner.Signed-off-by: Dan Rosenberg
Reviewed-by: Eugene Teo
Signed-off-by: Alex Elder -
drivers/net/sfc/ethtool.c: In function ‘efx_ethtool_self_test’:
drivers/net/sfc/ethtool.c:613: warning: the frame size of 1200 bytes
is larger than 1024 bytesSigned-off-by: Eric Dumazet
Acked-by: Ben Hutchings
Signed-off-by: David S. Miller -
Currently the bridge multicast snooping feature periodically issues
IPv6 general multicast listener queries to sense the absence of a
listener.For this, it uses :: as its source address - however RFC 2710 requires:
"To be valid, the Query message MUST come from a link-local IPv6 Source
Address". Current Linux kernel versions seem to follow this requirement
and ignore our bogus MLD queries.With this commit a link local address from the bridge interface is being
used to issue the MLD query, resulting in other Linux devices which are
multicast listeners in the network to respond with a MLD response (which
was not the case before).Signed-off-by: Linus Lüssing
Signed-off-by: David S. Miller -
Map the IPv6 header's destination multicast address to an ethernet
source address instead of the MLD queries multicast address.For instance for a general MLD query (multicast address in the MLD query
set to ::), this would wrongly be mapped to 33:33:00:00:00:00, although
an MLD queries destination MAC should always be 33:33:00:00:00:01 which
matches the IPv6 header's multicast destination ff02::1.Signed-off-by: Linus Lüssing
Signed-off-by: David S. Miller -
Currently the multicast bridge snooping support is not active for
link local multicast. I assume this has been done to leave
important multicast data untouched, like IPv6 Neighborhood Discovery.In larger, bridged, local networks it could however be desirable to
optimize for instance local multicast audio/video streaming too.With the transient flag in IPv6 multicast addresses we have an easy
way to optimize such multimedia traffic without tempering with the
high priority multicast data from well-known addresses.This patch alters the multicast bridge snooping for IPv6, to take
effect for transient multicast addresses instead of non-link-local
addresses.Signed-off-by: Linus Lüssing
Signed-off-by: David S. Miller -
This commit adds the missing IPv6 multicast address flag defines to
complement the already existing multicast address scope defines and to
be able to check these flags nicely in the future.Signed-off-by: Linus Lüssing
Signed-off-by: David S. Miller -
The nsrcs number is 2 Byte wide, therefore we need to call ntohs()
before using it.Signed-off-by: Linus Lüssing
Signed-off-by: David S. Miller -
We actually want a pointer to the grec_nsrcr and not the following
field. Otherwise we can get very high values for *nsrcs as the first two
bytes of the IPv6 multicast address are being used instead, leading to
a failing pskb_may_pull() which results in MLDv2 reports not being
parsed.Signed-off-by: Linus Lüssing
Signed-off-by: David S. Miller
