James Ketrenos [Wed, 21 Sep 2005 17:23:51 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated hostap to be compatible with extra_prefix_len changes
tree
8c1676c8a15c08e6d4c718fc7cd42d9bf4cd8235
parent
0ccc3dd6469ed492578c184f47dde2baccde3593
author James Ketrenos <jketreno@linux.intel.com>
1126715240 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316717 -0500
Updated hostap to be compatible with extra_prefix_len changes.
Accomplished via:
for i in hostap_ap.c hostap_80211_tx.c; do
sed -i -e "s:\([.>]\)extra_prefix_len:\1extra_mpdu_prefix_len:g" \
-e "s:\([.>]\)extra_postfix_len:\1extra_mpdu_postfix_len:g" \
drivers/net/wireless/hostap/$i
done
CC: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:49 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated hostap to be compatible with ieee80211_hdr changes
tree
8ec97d9056ceaf0f845ed51175dd842b700baadd
parent
329128457008ace3110c96971addf85a767dd5af
author James Ketrenos <jketreno@linux.intel.com>
1126714484 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316636 -0500
Updated hostap to be compatible with ieee80211_hdr changes.
Change accomplished via:
for i in hostap_ap.{c,h} hostap_80211_{t,r}x.c; do
sed -i -e "s:ieee80211_hdr\([^_]\):ieee80211_hdr_4addr\1:g" \
drivers/net/wireless/hostap/$i
done
CC: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:43 +0000 (11:58 -0500)]
[PATCH] ieee80211: Updated copyright dates
tree
0d3e41e574fcb41b9da7f0b7e1d27ec350726654
parent
dbe2885fe2f454d538eaaabefc741ded1026f476
author James Ketrenos <jketreno@linux.intel.com>
1126720499 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127314531 -0500
Updated copyright dates.
NOTE: This is a split out of just the copyright updates from patch
24/29 in the prior series.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:38 +0000 (11:58 -0500)]
[PATCH] ieee80211: Keep auth mode unchanged after iwconfig key off/on cycle
tree
2e6f6e7dc4f4eeb8e3dc265020016dd53e40578a
parent
ba2075794a089430b3dd7c90ff46ce1b67e9c7cc
author Zhu Yi <yi.zhu@intel.com>
1125551043 +0800
committer James Ketrenos <jketreno@linux.intel.com>
1127314475 -0500
[Bug 768] Keep auth mode unchanged after iwconfig key off/on cycle.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:32 +0000 (11:58 -0500)]
[PATCH] ieee80211: Mixed PTK/GTK CCMP/TKIP support
tree
5c7559a1216ae1121487f6aed94a6017490729b3
parent
c1ff4c22e5622c8987bf96c09158c4924cde98c2
author Hong Liu <hong.liu@intel.com>
1125482767 +0800
committer James Ketrenos <jketreno@linux.intel.com>
1127314427 -0500
Mixed PTK/GTK CCMP/TKIP support.
Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:29 +0000 (11:58 -0500)]
[PATCH] ieee80211: Type-o, capbility definition for QoS, and ERP parsing
tree
3ac0dd07b9972dfd68fee47ec2152d3d378de000
parent
9ada1d971d9829c34a14d98840080b7e69fdff6b
author Mohamed Abbad <mohamed.abbas@intel.com>
1126054379 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127314340 -0500
Type-o, capbility definition for QoS, and ERP parsing
Added WLAN_CAPABILITY_QOS
Fixed type-o WLAN_CAPABILITY_OSSS_OFDM -> WLAN_CAPABILITY_DSSS_OFDM
Added ERP IE parsing to ieee80211_rx
Added handle_probe_request callback.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:24 +0000 (11:58 -0500)]
[PATCH] ieee80211: "extern inline" to "static inline"
tree
bce04549ce0a8239d8083d8da5c3d12f7e1aecd9
parent
b15a5153d5f1c75d9435d5ce19b52287059d5d54
author Adrian Bunk <bunk@stusta.de>
1125026386 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313953 -0500
"extern inline" doesn't make much sense.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:49 +0000 (11:56 -0500)]
[PATCH] ieee80211: Additional fixes for endian-aware types
tree
589bbb92ce7cdf7c2ae820b0ebd3f8fbf1baeee9
parent
c6ce9081e79e8836a11e86e3d38297521a2420be
author Jiri Benc <jbenc@suse.cz>
1125015310 -0400
committer James Ketrenos <jketreno@linux.intel.com>
1127313914 -0500
Additional fixes for endian-aware types
Based on the application of __le16/__be16 changes already made w/ a
prior patch by Michael Wu <flamingice@sourmilk.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:42 +0000 (11:56 -0500)]
[PATCH] ieee80211: Added ieee80211_radiotap.h
tree
383c59b2516a61f2683f02dfebbed0caf6ee5dc3
parent
a04948f63fd96c4b875a43f78afad1a0874cc441
author Mike Kershaw <dragorn@kismetwireless.net>
1124447833 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313883 -0500
Added ieee80211_radiotap.h to enhance statistic reporting to user space
from wireless drivers.
Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:38 +0000 (11:56 -0500)]
[PATCH] ieee80211: Added ieee80211_geo to provide helper functions
tree
385b391fc0d7c124cd0547fdb6183e9a0c333391
parent
97d7a47f76e72bedde7f402785559ed4c7a8e8e8
author James Ketrenos <jketreno@linux.intel.com>
1124447590 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313735 -0500
Added ieee80211_geo to provide helper functions to drivers for
implementing supported channel maps.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:33 +0000 (11:56 -0500)]
[PATCH] ieee80211: Add QoS (WME) support to the ieee80211 subsystem
tree
a3ad796273e98036eb0e9fc063225070fa24508a
parent
1b9c0aeb377abf8e4a43a86cff42382f74ca0259
author Mohamed Abbas <mabbas@linux.intel.com>
1124447069 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313435 -0500
Add QoS (WME) support to the ieee80211 subsystem.
NOTE: This requires drivers that use the ieee80211 hard_start_xmit
(ipw2100 and ipw2200) to add the priority parameter to their callback.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:27 +0000 (11:56 -0500)]
[PATCH] ieee80211: Return NETDEV_TX_BUSY when QoS buffer full
tree
ba6509c7cd1dd4244a2f285f2da5d632e7ffbb25
parent
7b5f9f2ddcabdaea214527a895e6e8445cafdd80
author James Ketrenos <jketreno@linux.intel.com>
1124447000 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313383 -0500
Per the conversations with folks at OLS, the QoS layer in 802.11
drivers can now result in NETDEV_TX_BUSY being returned when the queue
a packet is targetted for is full.
To implement this, ieee80211_xmit will now call the driver's
is_queue_full to determine if the current priority queue is full. If
so, NETDEV_TX_BUSY is returned to the kernel and no processing is done
on the frame.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:53 +0000 (11:54 -0500)]
[PATCH] ieee80211: Fix TKIP, repeated fragmentation problem, and payload_size reporting
tree
8428e9f510e6ad6c77baec89cb57374842abf733
parent
d78bfd3ddae9c422dd350159110f9c4d7cfc50de
author Liu Hong <hong.liu@intel.com>
1124446520 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313183 -0500
Fix TKIP, repeated fragmentation problem, and payload_size reporting
1. TKIP encryption
Originally, TKIP encryption issues msdu + mpdu encryption on every
fragment. Change the behavior to msdu encryption on the whole
packet, then mpdu encryption on every fragment.
2. Avoid repeated fragmentation when !host_encrypt.
We only need do fragmentation when using host encryption. Otherwise
we only need pass the whole packet to driver, letting driver do the
fragmentation.
3. change the txb->payload_size to correct value
FW will use this value to determine whether to do fragmentation. If
we pass the wrong value, fw may cut on the wrong bound which will
make decryption fail when we do host encryption.
NOTE: This requires changing drivers (hostap) that have
extra_prefix_len used within them (structure member name change).
Signed-off-by: Hong Liu <liu.hong@intel.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:47 +0000 (11:54 -0500)]
[PATCH] ieee82011: Added ieee80211_tx_frame to convert generic 802.11 data frames, and callbacks
tree
40adc78b623ae70d56074934ec6334eb4f0ae6a5
parent
db43d847bcebaa3df6414e26d0008eb21690e8cf
author James Ketrenos <jketreno@linux.intel.com>
1124445938 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313102 -0500
Added ieee80211_tx_frame to convert generic 802.11 data frames into
txbs for transmission.
Added several purpose specific callbacks (handle_assoc, handle_auth,
etc.) which the driver can register with for being notified on
reception of variouf frame elements.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:43 +0000 (11:54 -0500)]
[PATCH] ieee80211: adds support for the creation of RTS packets
tree
b45c9c1017fd23216bfbe71e441aed9aa297fc84
parent
04aacdd71e904656a304d923bdcf57ad3bd2b254
author Ivo van Doorn <IvDoorn@gmail.com>
1124445405 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313029 -0500
This patch adds support for the creation of RTS packets when the
config flag CFG_IEEE80211_RTS has been set.
Signed-Off-By: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:36 +0000 (11:54 -0500)]
[PATCH] ieee80211: Renamed ieee80211_hdr to ieee80211_hdr_3addr
tree
e9c18b2c8e5ad446a4d213243c2dcf9fd1652a7b
parent
4e97ad6ae7084a4f741e94e76c41c68bc7c5a76a
author James Ketrenos <jketreno@linux.intel.com>
1124444315 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312922 -0500
Renamed ieee80211_hdr to ieee80211_hdr_3addr and modified ieee80211_hdr
to just contain the frame_ctrl and duration_id.
Changed uses of ieee80211_hdr to ieee80211_hdr_4addr or
ieee80211_hdr_3addr based on what was expected for that portion of code.
NOTE: This requires changes to ipw2100, ipw2200, hostap, and atmel
drivers.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:30 +0000 (11:54 -0500)]
[PATCH] ieee82011: Added WE-18 support to default wireless extension handler
tree
1536f39c18756698d033da72c49300a561be1289
parent
07172d7c9f10ee3d05d6f6489ba6d6ee2628da06
author Liu Hong <hong.liu@intel.com>
1124436225 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312664 -0500
Added WE-18 support to default wireless extension handler in ieee80211
subsystem.
Updated patch since last send to account for ieee80211_device parameter
being added to the crypto init method.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:22 +0000 (11:54 -0500)]
[PATCH] ieee80211: Allow drivers to fix an issue when using wpa_supplicant with WEP
tree
898fedef6ca1b5b58b8bdf7e6d8894a78bbde4cd
parent
8720fff53090ae428d2159332b6f4b2749dea10f
author Zhu Yi <jketreno@io.(none)>
1124435746 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312509 -0500
Allow drivers to fix an issue when using wpa_supplicant with WEP.
The problem is introduced by the hwcrypto patch. We changed indicator of
the encryption request from the upper layer (i.e. wpa_supplicant):
In the original host based crypto the driver could use: crypt &&
crypt->ops.
In the new hardware based crypto, the driver should use the flags
specified in ieee->sec.encrypt.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:15 +0000 (11:54 -0500)]
[PATCH] ieee80211: Fix kernel Oops when module unload
tree
b69e983266840983183a00f5ac02c66d5270ca47
parent
cdd6372949b76694622ed74fe36e1dd17a92eb71
author Zhu Yi <jketreno@io.(none)>
1124435425 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312421 -0500
Fix kernel Oops when module unload.
Export a new function ieee80211_crypt_quiescing from ieee80211. Device
drivers call it to make the host crypto stack enter the quiescence
state, which means "process existing requests, but don't accept new
ones". This is usually called during a driver's host crypto data
structure free (module unload) path.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:07 +0000 (11:54 -0500)]
[PATCH] ieee80211: Fix time calculation, switching to use jiffies_to_msecs
tree
b9cdd7058b787807655ea6f125e2adbf8d26c863
parent
85d9b2bddfcf3ed2eb4d061947c25c6a832891ab
author Zhu Yi <jketreno@io.(none)>
1124435212 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312152 -0500
Fix time calculation, switching to use jiffies_to_msecs.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:53:54 +0000 (11:53 -0500)]
[PATCH] ieee80211: Hardware crypto and fragmentation offload support
tree
5322d496af90d03ffbec27292dc1a6268a746ede
parent
6c9364386ccb786e4a84427ab3ad712f0b7b8904
author James Ketrenos <jketreno@linux.intel.com>
1124432367 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127311810 -0500
Hardware crypto and fragmentation offload support added (Zhu Yi)
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:53:43 +0000 (11:53 -0500)]
[PATCH] ieee80211: Fixed a kernel oops on module unload
tree
367069f24fc38b4aa910e86ff40094d2078d8aa7
parent
a33a1982012e9070736e3717231714dc9892303b
author James Ketrenos <jketreno@linux.intel.com>
1124430800 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127310571 -0500
Fixed a kernel oops on module unload by adding spin lock protection to
ieee80211's crypt handlers (thanks to Zhu Yi)
Modified scan result logic to report WPA and RSN IEs if set (vs.being
based on wpa_enabled)
Added ieee80211_device as the first parameter to the crypt init()
method. TKIP modified to use that structure for determining whether to
countermeasures are active.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:46 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated atmel to be compatible with ieee80211_hdr changes
tree
d7be83000b058b14450d76f99c432b1fb2a1c177
parent
322201093e03830fceedfc24931420b1ea855a8c
author James Ketrenos <jketreno@linux.intel.com>
1127316330 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316330 -0500
Updated atmel to be compatible with ieee80211_hdr changes.
Change accomplished via:
sed -i -e "s:ieee80211_hdr\([^_]\):ieee80211_hdr_4addr\1:g" \
drivers/net/wireless/atmel.c
Compile tested only.
CC: simon@thekelleys.org.uk
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:43 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.
tree
713b6ff3311decfe42d5209f7b2508736d144b85
parent
6465beff0e89779330450dffc2a5e6dc5154eebf
author James Ketrenos <jketreno@linux.intel.com>
1126716726 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316162 -0500
Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:41 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211_hdr changes
tree
9f86c7b4f59249c05c96c360dfaa817995e8a44f
parent
9b09701b2c6254f2fddb009004a14eb5a908714f
author James Ketrenos <jketreno@linux.intel.com>
1126714305 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316074 -0500
Updated ipw2200 to be compatible with ieee80211_hdr changes.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:37 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change
tree
ee48cbe413b795d6be454b9baf4f3bd3d74814cb
parent
49856b147763bd6847e0d8f53aee1ddd61385638
author James Ketrenos <jketreno@linux.intel.com>
1126716634 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316024 -0500
Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:25 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211_hdr changes
tree
992b203395c50342f1cced415acae6177344e270
parent
c59bb604a2ff4e40232ff0422e7adc44e3b007a0
author James Ketrenos <jketreno@linux.intel.com>
1126714006 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127315910 -0500
Updated ipw2100 to be compatible with ieee80211_hdr changes.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Jeff Garzik [Thu, 22 Sep 2005 02:34:08 +0000 (22:34 -0400)]
Merge /spare/repo/linux-2.6/
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:49 +0000 (18:40 +0200)]
[PATCH] uml: fix compile warning after consolidation patch
The header declaring this function wasn't included, so the function declaration
was totally bogus wrt. the proto - even if this wasn't going to fail at all.
It was so bad that the compile warning I got was "control reaches end of
non-void function", i.e. missing return. Actually, this has been there for ages,
the consolidation patch just added the warning which was needed to clean it up.
Nice. Really.
Cc: Allan Graves <allan.graves@gmail.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:29 +0000 (18:40 +0200)]
[PATCH] uml: comment about cast build fix
Explain why the casting we do to silence this warning is indeed safe.
It is because the field we're casting from, though being 64-bit wide, was filled
with a pointer in first place by ourselves.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:10 +0000 (18:40 +0200)]
[PATCH] uml: readd removed unistd.h inclusion
Readd this header (deleted in
60d339f6fe0831060600c62418b71a62ad26c281). A
warning is spit out here about undeclared getpgrp().
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:47 +0000 (18:39 +0200)]
[PATCH] uml: fix bogus HOST_ELF_CLASS symbol name
Even if with a bit of misunderstanding, Al fixed this in commit
95608261dae863bc43292e6fbd946a3abd3aa49f.
Well, the symbol was intended to come from userspace (it exists there on normal
host), but since some hosts may miss that, using the kernel one is just as fine.
However, rename it to be named consistently with the rest.
Actually, he missed converting ELFCLASS32 to coming from kernel headers. For
consistence, add ELFCLASS64 too.
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:32 +0000 (18:39 +0200)]
[PATCH] uml: Fix conflict between libc and ipv6
gcc is now complaining during link on some hosts - fix it as for other things.
Reported by Antoine Martin <antoine@nagafix.co.uk>.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:14 +0000 (18:39 +0200)]
[PATCH] uml: fix uname output on 32-bit binary on 64-bit host
Translate uname output taken from the host if needed.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:57 +0000 (18:38 +0200)]
[PATCH] uml: fix modify_ldt - missing break in switch
I am a lamer :-(. Luckily, Luo Xin performed LTP testing and found this failure.
Btw, the fact that the patch in which I introduced this was merged shows that:
a) I'm really trusted by people
b) sometimes they're wrong about point a).
c) lack of time for reviewers.
CC: Luo Xin <luothing@sina.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:33 +0000 (18:38 +0200)]
[PATCH] uml: remove verify_area_{tt,skas}
When removing verify_area, verify_area_{tt,skas} were forgotten.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:09 +0000 (18:38 +0200)]
[PATCH] Remove unused var from asm/futex.h
As recently done by Russell King for ARM, commit
4732efbeb997189d9f9b04708dc26bf8613ed721 introduces a generic asm/futex.h copied
along most arches, which includes a "-ENOSYS support" to be changed if needed.
However, it includes an unused var (taken from the "real" version) which GCC
warns about.
Remove it from all arches having that file version (i.e. same GIT id).
$ git-diff-tree -r HEAD
and
$ git-ls-tree -r HEAD include/|grep
9feff4ce1424bc390608326240be369eb13aa648
may be more interesting than looking at the patch itself, to make sure I've
just copied the arm header to all other archs having the original dummy version
of this file.
Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:37:14 +0000 (18:37 +0200)]
[PATCH] uml: adapt asm/futex.h to our arch
Follow up to
4732efbeb997189d9f9b04708dc26bf8613ed721 - uml must just reuse
as-is the backing architecture support. There is a micro-fixup is needed for the
included file, which won't affect i386 behaviour at all.
I've not tested compilation on x86_64, only on x86, but the code is almost the
same except the culprit test, so everything should be ok on x86_64 too.
Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Wed, 21 Sep 2005 21:30:37 +0000 (14:30 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Catalin Marinas [Wed, 21 Sep 2005 21:14:05 +0000 (22:14 +0100)]
[ARM] 2932/1: Avoid the "noreturn" warning in arch/arm/kernel/traps.c
Patch from Catalin Marinas
This patch prevents the "noreturn function does return" warning in the
__bug() function in arch/arm/kernel/traps.c
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Wed, 21 Sep 2005 20:21:35 +0000 (13:21 -0700)]
Merge /pub/scm/linux/kernel/git/roland/infiniband
Hal Rosenstock [Wed, 21 Sep 2005 19:33:09 +0000 (12:33 -0700)]
[IB] Fix RMPP receive length calculation
Based on simplification idea from Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Sean Hefty [Wed, 21 Sep 2005 19:31:26 +0000 (12:31 -0700)]
[IB] Add MAD data field size definitions
Clean up code by using enums instead of hard-coded magic numbers.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Stephane Kardas [Wed, 21 Sep 2005 16:55:45 +0000 (09:55 -0700)]
[PATCH] fat: fix adate
During a forensic analysis on the fat file system, I found than the result for
the last access date on this file system was different between the stat
command and the istat command (package tct-utils).
The istat command display a true date (the right windows date) but the stat
primitive (so stat, find, ls command) displays a wrong date.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Randy Dunlap [Wed, 21 Sep 2005 16:55:44 +0000 (09:55 -0700)]
[PATCH] update URL for HPET spec.
Correct URL for HPET spec.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric Dumazet [Wed, 21 Sep 2005 16:55:43 +0000 (09:55 -0700)]
[PATCH] Adds sys_set_mempolicy() in include/linux/syscalls.h
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Stephen Hemminger [Wed, 21 Sep 2005 16:55:41 +0000 (09:55 -0700)]
[PATCH] skge: add maintainer
Add MAINTAINER record for Andrew ;-)
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Christoph Hellwig [Wed, 21 Sep 2005 16:55:40 +0000 (09:55 -0700)]
[PATCH] fixup Documentation/DocBook/kernel-hacking.tmpl
__FUNCTION__ is the prefered kernel idiom, __func__ is not supported by gcc
2.95 (we actually map __FUNCTION__ to __func__ for more recent compilers,
but it should never be used directly)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:39 +0000 (09:55 -0700)]
[PATCH] mm: add a note about partially hardcoded VM_* flags
Hugh made me note this line for permission checking in mprotect():
if ((newflags & ~(newflags >> 4)) & 0xf) {
after figuring out what's that about, I decided it's nasty enough. Btw
Hugh itself didn't like the 0xf.
We can safely change it to VM_READ|VM_WRITE|VM_EXEC because we never change
VM_SHARED, so no need to check that.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:38 +0000 (09:55 -0700)]
[PATCH] mm: update stale comment for removal of page->list
Update comment for the 2.6.6-rc1 conversion from page->list and
address_space->{clean,dirty,locked}_pages to radix tree tagging and ->lru.
I've mostly avoided to mention page lists (at least I've shortened the
comment).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:37 +0000 (09:55 -0700)]
[PATCH] README update from the stone age
We have no options which the user can set in the Makefile. Only the
EXTRAVERSION, which is also useful in place of the "backup modules"
suggestion.
We don't have configuration options in the top Makefile.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:37 +0000 (09:55 -0700)]
[PATCH] fix locking comment in unmap_region()
That comment is plain wrong (we even take the pagetable lock inside
unmap_region()).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Deepak Saxena [Wed, 21 Sep 2005 16:55:35 +0000 (09:55 -0700)]
[PATCH] Fix I2O config-osm init to return proper error
We currently unregister the config-osm driver if initialization of the
legacy ioctl() handlers failed but still return success. We should be
returning -EBUSY in this case.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Wed, 21 Sep 2005 16:55:34 +0000 (09:55 -0700)]
[PATCH] ppc64: Build zImage.vmode for G5
zImage.vmode was recently added. It's a version of zImage in which the ELF
note section used by open firmware indicates that it requires a virtual
mode instance of OF instead of real mode. This allows it to work with
Apple OF, and thus is directly bootable (or netbootable) from OF command
line. (Unfortunately, pSeries OF sort-of requires real mode and Apple OF
sort-of requires virtual mode, and both tend to be unhappy if no notes
section specifies the mode at all).
However, we forgot to add zImage.vmode to the default G5 build. This
fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Christoph Hellwig [Wed, 21 Sep 2005 16:55:33 +0000 (09:55 -0700)]
[PATCH] remove blkdev_scsi_issue_flush_fn again
This function was removed a while ago, but crept in again via a recent
scsi merge.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Anton Blanchard [Wed, 21 Sep 2005 16:55:33 +0000 (09:55 -0700)]
[PATCH] ppc64: Fix issue with non zero boot cpu
The new version of the flattened device tree passes the boot cpuid in the
header instead of via a linux,boot-cpu property.
We need to update the in kernel OF parsing code to do this, otherwise
machines with a non zero boot cpuid fail to come up.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Mike Miller [Wed, 21 Sep 2005 16:55:32 +0000 (09:55 -0700)]
[PATCH] cciss: busy_initializing bug fix
This patch fixes the problem Bjorn reported. The busy_initializing flag
should have cleared before going into the for loop.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Olof Johansson [Wed, 21 Sep 2005 16:55:31 +0000 (09:55 -0700)]
[PATCH] PPC64: Fix boot for some pre-POWER4 systems
Some RS64 systems (such as F80) have non-python host bridges with EADS.
However, they have two EADS with 4 buses each under them, so the old logic
that assumed no more than 7 busses per PHB failed miserably.
Big thanks to Olaf Hering for helping me test this, he's got one of the few
machines that broke from the previous logic.
Also, to be a bit smarter at detecting the need for a PHB-level IOMMU table
by checking for the presence of an ISA bus. Only PHBs with ISA bridges
should need the PHB-level table.
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton [Wed, 21 Sep 2005 16:55:30 +0000 (09:55 -0700)]
[PATCH] Add printk_clock()
ia64's sched_clock() accesses per-cpu data which isn't set up at boot time.
Hence ia64 cannot use printk timestamping, because printk() will crash in
sched_clock().
So make printk() use printk_clock(), defaulting to sched_clock(), overrideable
by the architecture via attribute(weak).
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Sripathi Kodi [Mon, 19 Sep 2005 23:26:12 +0000 (18:26 -0500)]
[PATCH] Fix invisible threads problem
When the main thread of a thread group has done pthread_exit() and died,
the other threads are still happily running, but will not be visible
under /proc because their leader is no longer accessible.
This fixes the access control so that we can see the sub-threads again.
Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
Acked-by: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paul Mackerras [Wed, 21 Sep 2005 04:14:22 +0000 (14:14 +1000)]
[PATCH] ppc64: Fix PCI flags when using OF device tree
My code to set up the PCI tree from the Open Firmware device tree was
setting IORESOURCE_* flags on the resources for the devices, but not
the PCI_BASE_ADDRESS_* flags. This meant that some drivers
misbehaved, and /proc/pci showed the wrong types for the resources.
This fixes it.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Wed, 21 Sep 2005 14:53:38 +0000 (07:53 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Wed, 21 Sep 2005 14:53:05 +0000 (07:53 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Christopher Zimmermann [Wed, 21 Sep 2005 07:41:22 +0000 (00:41 -0700)]
[SPARC] cs4231: Fix SBUS support in this driver.
From: Christopher Zimmermann <madroach@zakweb.de>
This patch enables SBus support for the cs4231 sound driver.
It is tested on an Ultra2. Capture and playback both work.
I experienced lags and crashes using certain threaded
players like ogg123 and mp3blaster, while the former is
lagging far more. This behavior may be specific to SMP
systems. It is reproducable using the dummy sound card
driver. Sox works flawlessly.
Setting up the calculation of ptr in snd_cs4231_playback_pointer
was a bit strange. I got it to work by not incrementing the
[pc]_periods_sent counter when starting DMA the first time
in cs4231_dma_trigger. Therefore this dummy thing.
[ I did some minor cleanups -DaveM ]
Signed-off-by: David S. Miller <davem@davemloft.net>
Tom 'spot' Callaway [Wed, 21 Sep 2005 07:29:16 +0000 (00:29 -0700)]
[ATYFB]: Fix build with CONFIG_FB_ATY_GENERIC_LCD disabled.
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stephen Hemminger [Wed, 21 Sep 2005 07:19:46 +0000 (00:19 -0700)]
[TCP]: Set default congestion control correctly for incoming connections.
Patch from Joel Sing to fix the default congestion control algorithm
for incoming connections. If a new congestion control handler is added
(via module), it should become the default for new
connections. Instead, the incoming connections use reno. The cause is
incorrect initialisation causes the tcp_init_congestion_control()
function to return after the initial if test fails.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Acked-by: Ian McDonald <imcdnzl@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stephen Hemminger [Wed, 21 Sep 2005 07:15:39 +0000 (00:15 -0700)]
[FIB_TRIE]: message cleanup
Cleanup the printk's in fib_trie:
* Convert a couple of places in the dump code to BUG_ON
* Put log level's on each message
The version message really needed the message since it leaks out
on the pretty Fedora bootup.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Acked-by: Robert Olsson <Robert.Olsson@data.slu.se>,
Signed-off-by: David S. Miller <davem@davemloft.net>
Eric W. Biederman [Wed, 21 Sep 2005 07:11:37 +0000 (00:11 -0700)]
[AF_PACKET]: Allow for > 8 byte hardware addresses.
The convention is that longer addresses will simply extend
the hardeware address byte arrays at the end of sockaddr_ll and
packet_mreq.
In making this change a small information leak was also closed.
The code only initializes the hardware address bytes that are
used, but all of struct sockaddr_ll was copied to userspace.
Now we just copy sockaddr_ll to the last byte of the hardware
address used.
For error checking larger structures than our internal
maximums continue to be allowed but an error is signaled if we can
not fit the hardware address into our internal structure.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Wed, 21 Sep 2005 00:38:51 +0000 (17:38 -0700)]
Merge /pub/scm/linux/kernel/git/roland/infiniband
Antonino A. Daplas [Tue, 20 Sep 2005 23:32:49 +0000 (07:32 +0800)]
[PATCH] fbdev: Fix reversed back and front porches
In fbdev perspective, the frontporch is the lower/right margin and the
backporch is the upper/left margin.
Correct.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Antonino A. Daplas [Tue, 20 Sep 2005 23:30:21 +0000 (07:30 +0800)]
[PATCH] nvidiafb: Fix absence of cursor in nvidiafb
A recent change in nvidiafb caused nvidiafb_cursor to always return -ENXIO
instead of using the soft_cursor. This will happen if the parameter "hwcur"
is not set, which happens to be the default.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Tue, 20 Sep 2005 20:01:13 +0000 (21:01 +0100)]
[ARM] Fix pcf8583 to build
Seems that the Acorn RTC driver missed an update. Fix it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
David S. Miller [Tue, 20 Sep 2005 19:18:38 +0000 (12:18 -0700)]
[SPARC64]: Verify vmalloc TLB misses more strictly.
Arrange the modules, OBP, and vmalloc areas such that a range
verification can be done quite minimally.
Signed-off-by: David S. Miller <davem@davemloft.net>
Michael S. Tsirkin [Tue, 20 Sep 2005 17:54:48 +0000 (10:54 -0700)]
[PATCH] IB/mthca: Fix device removal memory leak
Clean up QP table array on device removal.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Roland Dreier [Tue, 20 Sep 2005 17:52:04 +0000 (10:52 -0700)]
[PATCH] IPoIB: Don't flush workqueue from within workqueue
ipoib_mcast_restart_task() is always called from within the
single-threaded IPoIB workqueue, so flushing the workqueue from within
the function can lead to a recursion overflow. But since we're
running in a single-threaded workqueue, we're already synchronized
against other items in the workqueue, so just get rid of the flush in
ipoib_mcast_restart_task().
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Russell King [Tue, 20 Sep 2005 16:52:13 +0000 (17:52 +0100)]
[ARM] Prevent deadlock in page fault handler
As per x86, we may deadlock while trying to get the mmap semaphore.
Implement the same fix, which allows (eg) recursive faults to cause
an oops instead of deadlocking.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Tue, 20 Sep 2005 16:24:33 +0000 (17:24 +0100)]
[ARM] 2928/1: S3C2410 - make machine init code static
Patch from Ben Dooks
This code is not being exported, declare it static
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Tue, 20 Sep 2005 15:54:33 +0000 (08:54 -0700)]
Merge /pub/scm/linux/kernel/git/aia21/ntfs-2.6
Linus Torvalds [Tue, 20 Sep 2005 15:50:49 +0000 (08:50 -0700)]
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6
Ben Dooks [Tue, 20 Sep 2005 15:45:20 +0000 (16:45 +0100)]
[ARM] 2927/1: .arch.info - postfix section with .init for `make buildcheck`
Patch from Ben Dooks
The `make buildcheck` is erroneously reporting that the .arch.info
list is referencing items in the .init section as it is not itself
postfixed with .init
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Tue, 20 Sep 2005 15:35:03 +0000 (16:35 +0100)]
[ARM] 2926/1: .proc.info - postfix section with .init for `make buildcheck`
Patch from Ben Dooks
The `make buildcheck` is erroneously reporting that the .proc.info
list is referencing items in the .init section as it is not itself
postfixed with .init
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Tue, 20 Sep 2005 15:25:12 +0000 (16:25 +0100)]
[ARM] 2925/3: earlyparam - postfix section with .init for `make buildcheck`
Patch from Ben Dooks
The `make buildcheck` is erroneously reporting that the earlyparam
list is referencing items in the .init section as it is not itself
postfixed with .init
Also, as per rmk's suggestion, rename the __early_param to
.early_param to bring it into line with everything else
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Vincent Sanders [Tue, 20 Sep 2005 15:21:42 +0000 (16:21 +0100)]
[ARM] 2922/1: compile fix for shark
Patch from Vincent Sanders
Shark platform fails to build with gcc 4 because of a bad lvalue assignement
Signed-off-by: Vincent Sanders <vince@arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Tue, 20 Sep 2005 15:20:49 +0000 (16:20 +0100)]
[ARM] 2924/3: taglist - postfix section with .init for `make buildcheck`
Patch from Ben Dooks
The `make buildcheck` is erroneously reporting that the taglist
is referencing items in the .init section as it is not itself
postfixed with .init
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Anton Altaparmakov [Tue, 20 Sep 2005 13:19:30 +0000 (14:19 +0100)]
NTFS: More runlist handling fixes from Richard Russon and myself.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
David S. Miller [Tue, 20 Sep 2005 03:11:57 +0000 (20:11 -0700)]
[SPARC64]: Move DCACHE_ALIASING_POSSIBLE define to asm/page.h
This showed that arch/sparc64/kernel/ptrace.c was not getting
the define properly, and thus the code protected by this ifdef
was never actually compiled before. So fix that too.
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Tue, 20 Sep 2005 03:00:41 +0000 (20:00 -0700)]
Linux v2.6.14-rc2
Avast, ye scurvy land-lubbers! Time to try out a new release.
Arrr!
Ed L. Cashin [Tue, 20 Sep 2005 02:57:36 +0000 (19:57 -0700)]
[BYTEORDER]: Document alignment and byteorder macros
This patch comments the fact that although passing le64_to_cpup et
al. is within the intended use of the byteorder macros, using
get_unaligned is the recommended way to go.
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Tue, 20 Sep 2005 02:56:06 +0000 (19:56 -0700)]
[SPARC64]: Handle little-endian unaligned loads/stores correctly.
Because we use byte loads/stores to cons up the value
in and out of registers, we can't expect the ASI endianness
setting to take care of this for us. So do it by hand.
This case is triggered by drivers/block/aoe/aoecmd.c in the
ataid_complete() function where it goes:
/* word 100: number lba48 sectors */
ssize = le64_to_cpup((__le64 *) &id[100<<1]);
This &id[100<<1] address is 4 byte, rather than 8 byte aligned,
thus triggering the unaligned exception.
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Tue, 20 Sep 2005 02:54:29 +0000 (19:54 -0700)]
Make fsnotify possibly work better for the inode removal case
Checking i_nlink is dubious, but the alternatives look even
less appetizing.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 20 Sep 2005 01:46:11 +0000 (18:46 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Mark J Cox [Tue, 20 Sep 2005 00:55:30 +0000 (17:55 -0700)]
[PATCH] raw_sendmsg DoS on 2.6
Fix unchecked __get_user that could be tricked into generating a
memory read on an arbitrary address. The result of the read is not
returned directly but you may be able to divine some information about
it, or use the read to cause a crash on some architectures by reading
hardware state. CAN-2004-2492.
Fix from Al Viro, ack from Dave Miller.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Herbert Xu [Tue, 20 Sep 2005 01:18:38 +0000 (18:18 -0700)]
[TCP]: Handle SACK'd packets properly in tcp_fragment().
The problem is that we're now calling tcp_fragment() in a context
where the packets might be marked as SACKED_ACKED or SACKED_RETRANS.
This was not possible before as you never retransmitted packets that
are so marked.
Because of this, we need to adjust sacked_out and retrans_out in
tcp_fragment(). This is exactly what the following patch does.
We also need to preserve the SACKED_ACKED/SACKED_RETRANS marking
if they exist.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Alexey Dobriyan [Mon, 19 Sep 2005 22:41:28 +0000 (15:41 -0700)]
[8021Q]: Add endian annotations.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Krzysztof Halasa [Mon, 19 Sep 2005 22:39:32 +0000 (15:39 -0700)]
[WAN] hdlc_cisco: Fix regression introduced by skb->tail changes.
The following commit breaks cisco mode with my WAN drivers:
author David S. Miller <davem@davemloft.net>
Tue, 28 Jun 2005 22:25:31 +0000 (15:25 -0700)
commit
689be43945e9ca7dd704522e55af1b8a73a994d3
"[NET]: Remove gratuitous use of skb->tail in network drivers."
The following patch fixes it - please apply (cisco_hard_header does
skb_push(4 bytes)).
Signed-off-by: David S. Miller <davem@davemloft.net>
Harald Welte [Mon, 19 Sep 2005 22:35:57 +0000 (15:35 -0700)]
[NETFILTER]: Export ip_nat_port_{nfattr_to_range,range_to_nfattr}
Those exports are needed by the PPTP helper following in the next
couple of changes.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy [Mon, 19 Sep 2005 22:35:31 +0000 (15:35 -0700)]
[NETFILTER]: Rename misnamed function
Both __ip_conntrack_expect_find and ip_conntrack_expect_find_get take
a reference to the expectation, the difference is that callers of
__ip_conntrack_expect_find must hold ip_conntrack_lock.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Yasuyuki Kozakai [Mon, 19 Sep 2005 22:34:40 +0000 (15:34 -0700)]
[NETFILTER] ip6tables: remove duplicate code
Some IPv6 matches have very similar loops to find IPv6 extension header
and we can unify them. This patch introduces ipv6_find_hdr() to do it.
I just checked that it can find the target headers in the packet which has
dst,hbh,rt,frag,ah,esp headers.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Harald Welte [Mon, 19 Sep 2005 22:33:08 +0000 (15:33 -0700)]
[NETFILTER]: Add new PPTP conntrack and NAT helper
This new "version 3" PPTP conntrack/nat helper is finally ready for
mainline inclusion. Special thanks to lots of last-minute bugfixing
by Patric McHardy.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Robert Olsson [Mon, 19 Sep 2005 22:31:18 +0000 (15:31 -0700)]
[IPV4]: fib_trie RCU refinements
* This patch is from Paul McKenney's RCU reviewing.
Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
projects / openwrt / staging / blogic.git / log