diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:15:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:15:23 -0400 |
commit | f2d7499be1b1fe1cd8a5e6a01c1f44173894a241 (patch) | |
tree | 64d341a90d8cb831a5097e365d303367906f1373 /drivers/char | |
parent | 8d659f5e43c5db2630e85f507b7384365e9e1c1e (diff) | |
parent | 76aab2c1eae491a5d73ac83deec97dd28ebac584 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits)
pkt_sched: Fix actions referencing
bnx2x: fix logical op
tcp: (whitespace only) fix confusing indentation
pkt_sched: Fix qdisc config when link is down.
[Bluetooth] Add full quirk implementation for btusb driver
[Bluetooth] Removal of unnecessary ignore module parameter
[Bluetooth] Add parameters to control BNEP header compression
ath9k: Revamp wireless mode usage
ath9k: More unused macros
ath9k: Remove a few unused macros and fix indentation
ath9k: Use mac80211's band macros and remove enum hal_freq_band
ath9k: Remove redundant data structure ath9k_txq_info
ath9k: Cleanup data structures related to HW capabilities
ath9k: work around gcc ICEs
ath9k: Add new Atheros IEEE 802.11n driver
ath5k: remove Atheros 11n devices from supported list
list.h: add list_cut_position()
list.h: Add list_splice_tail() and list_splice_tail_init()
p54: swap short slot time dcf values
rt2x00: Block all unsupported modes
...
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 4 | ||||
-rw-r--r-- | drivers/char/synclink.c | 4 | ||||
-rw-r--r-- | drivers/char/synclink_gt.c | 5 | ||||
-rw-r--r-- | drivers/char/synclinkmp.c | 4 |
4 files changed, 0 insertions, 17 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index d1fceabe3aef..c240562c218b 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -232,7 +232,6 @@ typedef struct _mgslpc_info { | |||
232 | 232 | ||
233 | /* SPPP/Cisco HDLC device parts */ | 233 | /* SPPP/Cisco HDLC device parts */ |
234 | int netcount; | 234 | int netcount; |
235 | int dosyncppp; | ||
236 | spinlock_t netlock; | 235 | spinlock_t netlock; |
237 | 236 | ||
238 | #if SYNCLINK_GENERIC_HDLC | 237 | #if SYNCLINK_GENERIC_HDLC |
@@ -459,13 +458,11 @@ static int ttymajor=0; | |||
459 | 458 | ||
460 | static int debug_level = 0; | 459 | static int debug_level = 0; |
461 | static int maxframe[MAX_DEVICE_COUNT] = {0,}; | 460 | static int maxframe[MAX_DEVICE_COUNT] = {0,}; |
462 | static int dosyncppp[MAX_DEVICE_COUNT] = {1,1,1,1}; | ||
463 | 461 | ||
464 | module_param(break_on_load, bool, 0); | 462 | module_param(break_on_load, bool, 0); |
465 | module_param(ttymajor, int, 0); | 463 | module_param(ttymajor, int, 0); |
466 | module_param(debug_level, int, 0); | 464 | module_param(debug_level, int, 0); |
467 | module_param_array(maxframe, int, NULL, 0); | 465 | module_param_array(maxframe, int, NULL, 0); |
468 | module_param_array(dosyncppp, int, NULL, 0); | ||
469 | 466 | ||
470 | MODULE_LICENSE("GPL"); | 467 | MODULE_LICENSE("GPL"); |
471 | 468 | ||
@@ -2915,7 +2912,6 @@ static void mgslpc_add_device(MGSLPC_INFO *info) | |||
2915 | if (info->line < MAX_DEVICE_COUNT) { | 2912 | if (info->line < MAX_DEVICE_COUNT) { |
2916 | if (maxframe[info->line]) | 2913 | if (maxframe[info->line]) |
2917 | info->max_frame_size = maxframe[info->line]; | 2914 | info->max_frame_size = maxframe[info->line]; |
2918 | info->dosyncppp = dosyncppp[info->line]; | ||
2919 | } | 2915 | } |
2920 | 2916 | ||
2921 | mgslpc_device_count++; | 2917 | mgslpc_device_count++; |
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index ef6706f09061..500f5176b6ba 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -304,7 +304,6 @@ struct mgsl_struct { | |||
304 | 304 | ||
305 | /* generic HDLC device parts */ | 305 | /* generic HDLC device parts */ |
306 | int netcount; | 306 | int netcount; |
307 | int dosyncppp; | ||
308 | spinlock_t netlock; | 307 | spinlock_t netlock; |
309 | 308 | ||
310 | #if SYNCLINK_GENERIC_HDLC | 309 | #if SYNCLINK_GENERIC_HDLC |
@@ -868,7 +867,6 @@ static int irq[MAX_ISA_DEVICES]; | |||
868 | static int dma[MAX_ISA_DEVICES]; | 867 | static int dma[MAX_ISA_DEVICES]; |
869 | static int debug_level; | 868 | static int debug_level; |
870 | static int maxframe[MAX_TOTAL_DEVICES]; | 869 | static int maxframe[MAX_TOTAL_DEVICES]; |
871 | static int dosyncppp[MAX_TOTAL_DEVICES]; | ||
872 | static int txdmabufs[MAX_TOTAL_DEVICES]; | 870 | static int txdmabufs[MAX_TOTAL_DEVICES]; |
873 | static int txholdbufs[MAX_TOTAL_DEVICES]; | 871 | static int txholdbufs[MAX_TOTAL_DEVICES]; |
874 | 872 | ||
@@ -879,7 +877,6 @@ module_param_array(irq, int, NULL, 0); | |||
879 | module_param_array(dma, int, NULL, 0); | 877 | module_param_array(dma, int, NULL, 0); |
880 | module_param(debug_level, int, 0); | 878 | module_param(debug_level, int, 0); |
881 | module_param_array(maxframe, int, NULL, 0); | 879 | module_param_array(maxframe, int, NULL, 0); |
882 | module_param_array(dosyncppp, int, NULL, 0); | ||
883 | module_param_array(txdmabufs, int, NULL, 0); | 880 | module_param_array(txdmabufs, int, NULL, 0); |
884 | module_param_array(txholdbufs, int, NULL, 0); | 881 | module_param_array(txholdbufs, int, NULL, 0); |
885 | 882 | ||
@@ -4258,7 +4255,6 @@ static void mgsl_add_device( struct mgsl_struct *info ) | |||
4258 | if (info->line < MAX_TOTAL_DEVICES) { | 4255 | if (info->line < MAX_TOTAL_DEVICES) { |
4259 | if (maxframe[info->line]) | 4256 | if (maxframe[info->line]) |
4260 | info->max_frame_size = maxframe[info->line]; | 4257 | info->max_frame_size = maxframe[info->line]; |
4261 | info->dosyncppp = dosyncppp[info->line]; | ||
4262 | 4258 | ||
4263 | if (txdmabufs[info->line]) { | 4259 | if (txdmabufs[info->line]) { |
4264 | info->num_tx_dma_buffers = txdmabufs[info->line]; | 4260 | info->num_tx_dma_buffers = txdmabufs[info->line]; |
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index 3e9058993e41..509c89ac5bd3 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
@@ -128,17 +128,14 @@ static int slgt_device_count; | |||
128 | static int ttymajor; | 128 | static int ttymajor; |
129 | static int debug_level; | 129 | static int debug_level; |
130 | static int maxframe[MAX_DEVICES]; | 130 | static int maxframe[MAX_DEVICES]; |
131 | static int dosyncppp[MAX_DEVICES]; | ||
132 | 131 | ||
133 | module_param(ttymajor, int, 0); | 132 | module_param(ttymajor, int, 0); |
134 | module_param(debug_level, int, 0); | 133 | module_param(debug_level, int, 0); |
135 | module_param_array(maxframe, int, NULL, 0); | 134 | module_param_array(maxframe, int, NULL, 0); |
136 | module_param_array(dosyncppp, int, NULL, 0); | ||
137 | 135 | ||
138 | MODULE_PARM_DESC(ttymajor, "TTY major device number override: 0=auto assigned"); | 136 | MODULE_PARM_DESC(ttymajor, "TTY major device number override: 0=auto assigned"); |
139 | MODULE_PARM_DESC(debug_level, "Debug syslog output: 0=disabled, 1 to 5=increasing detail"); | 137 | MODULE_PARM_DESC(debug_level, "Debug syslog output: 0=disabled, 1 to 5=increasing detail"); |
140 | MODULE_PARM_DESC(maxframe, "Maximum frame size used by device (4096 to 65535)"); | 138 | MODULE_PARM_DESC(maxframe, "Maximum frame size used by device (4096 to 65535)"); |
141 | MODULE_PARM_DESC(dosyncppp, "Enable synchronous net device, 0=disable 1=enable"); | ||
142 | 139 | ||
143 | /* | 140 | /* |
144 | * tty support and callbacks | 141 | * tty support and callbacks |
@@ -349,7 +346,6 @@ struct slgt_info { | |||
349 | /* SPPP/Cisco HDLC device parts */ | 346 | /* SPPP/Cisco HDLC device parts */ |
350 | 347 | ||
351 | int netcount; | 348 | int netcount; |
352 | int dosyncppp; | ||
353 | spinlock_t netlock; | 349 | spinlock_t netlock; |
354 | #if SYNCLINK_GENERIC_HDLC | 350 | #if SYNCLINK_GENERIC_HDLC |
355 | struct net_device *netdev; | 351 | struct net_device *netdev; |
@@ -3405,7 +3401,6 @@ static void add_device(struct slgt_info *info) | |||
3405 | if (info->line < MAX_DEVICES) { | 3401 | if (info->line < MAX_DEVICES) { |
3406 | if (maxframe[info->line]) | 3402 | if (maxframe[info->line]) |
3407 | info->max_frame_size = maxframe[info->line]; | 3403 | info->max_frame_size = maxframe[info->line]; |
3408 | info->dosyncppp = dosyncppp[info->line]; | ||
3409 | } | 3404 | } |
3410 | 3405 | ||
3411 | slgt_device_count++; | 3406 | slgt_device_count++; |
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index c0490cbd0db2..6bdb44f7bec2 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -270,7 +270,6 @@ typedef struct _synclinkmp_info { | |||
270 | 270 | ||
271 | /* SPPP/Cisco HDLC device parts */ | 271 | /* SPPP/Cisco HDLC device parts */ |
272 | int netcount; | 272 | int netcount; |
273 | int dosyncppp; | ||
274 | spinlock_t netlock; | 273 | spinlock_t netlock; |
275 | 274 | ||
276 | #if SYNCLINK_GENERIC_HDLC | 275 | #if SYNCLINK_GENERIC_HDLC |
@@ -469,13 +468,11 @@ static int ttymajor = 0; | |||
469 | */ | 468 | */ |
470 | static int debug_level = 0; | 469 | static int debug_level = 0; |
471 | static int maxframe[MAX_DEVICES] = {0,}; | 470 | static int maxframe[MAX_DEVICES] = {0,}; |
472 | static int dosyncppp[MAX_DEVICES] = {0,}; | ||
473 | 471 | ||
474 | module_param(break_on_load, bool, 0); | 472 | module_param(break_on_load, bool, 0); |
475 | module_param(ttymajor, int, 0); | 473 | module_param(ttymajor, int, 0); |
476 | module_param(debug_level, int, 0); | 474 | module_param(debug_level, int, 0); |
477 | module_param_array(maxframe, int, NULL, 0); | 475 | module_param_array(maxframe, int, NULL, 0); |
478 | module_param_array(dosyncppp, int, NULL, 0); | ||
479 | 476 | ||
480 | static char *driver_name = "SyncLink MultiPort driver"; | 477 | static char *driver_name = "SyncLink MultiPort driver"; |
481 | static char *driver_version = "$Revision: 4.38 $"; | 478 | static char *driver_version = "$Revision: 4.38 $"; |
@@ -3752,7 +3749,6 @@ static void add_device(SLMP_INFO *info) | |||
3752 | if (info->line < MAX_DEVICES) { | 3749 | if (info->line < MAX_DEVICES) { |
3753 | if (maxframe[info->line]) | 3750 | if (maxframe[info->line]) |
3754 | info->max_frame_size = maxframe[info->line]; | 3751 | info->max_frame_size = maxframe[info->line]; |
3755 | info->dosyncppp = dosyncppp[info->line]; | ||
3756 | } | 3752 | } |
3757 | 3753 | ||
3758 | synclinkmp_device_count++; | 3754 | synclinkmp_device_count++; |