Re: [PATCH] ematch: oops from uninitialized variable (resend)
From: Stephen Hemminger [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 17:54:16 -0800 Setting up a meta match causes a kernel OOPS because of uninitialized elements in tree. ... Signed-off-by: Stephen Hemminger [EMAIL PROTECTED] Applied and I'll queue this up for -stable too, thanks! -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT-PULL Request]: SCTP fixes
From: Vlad Yasevich [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 15:27:21 -0500 The following changes since commit 3113e88c3cb3c0a22920b621f8e4d1f2ccc07f1e: Stephen Hemminger (1): [PKT_SCHED]: vlan tag match are available in the git repository at: [EMAIL PROTECTED]:/pub/scm/linux/kernel/git/vxy/lksctp-dev.git pending Vlad Yasevich (6): [SCTP]: Stop claiming that this is a reference implementation [SCTP]: Do not increase rwnd when reading partial notification. [SCTP]: Kill silly inlines in ulpqueue.c [SCTP]: Correctly reap SSNs when processing FORWARD_TSN chunk [SCTP]: Set ports in every address returned by sctp_getladdrs() [SCTP]: Make sure the chunk is off the transmitted list prior to freeing. Wei Yongjun (1): [SCTP]: Fix kernel panic while received ASCONF chunk with bad serial number Pulled and pushed out to net-2.6, thanks Vlad! -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] libertas: Don't mark exported symbols as static
On Fri, 2008-02-08 at 23:48 -0500, Christoph Hellwig wrote: On Fri, Feb 08, 2008 at 06:01:02PM -0800, Roland Dreier wrote: Why not pull the exports? they aren't used anywhere in the existing kernel. I'm guessing there's some not-(yet-)merged mesh networking stuff that uses the symbols, but it doesn't matter much to me... The general rule is to not keep symbols for out of tree stuff, so removing the exports makes more sense. If they aren't used in the in-kernel driver, just kill the export statements. Dan -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[patch] Documentation: fix tcp.txt
From: Matti Linnanvuori [EMAIL PROTECTED] Replace BIC with CUBIC as default congestion control. Fix grammar. Signed-off-by: Matti Linnanvuori [EMAIL PROTECTED] --- --- a/Documentation/networking/tcp.txt 2008-02-09 16:07:39.547357400 +0200 +++ b/Documentation/networking/tcp.txt 2008-02-09 16:12:49.497245900 +0200 @@ -1,7 +1,7 @@ TCP protocol -Last updated: 21 June 2005 +Last updated: 9 February 2008 Contents @@ -52,9 +52,9 @@ The method that is used to determine which congestion control mechanism is determined by the setting of the sysctl net.ipv4.tcp_congestion_control. The default congestion control will be the last one registered (LIFO); -so if you built everything as modules. the default will be reno. If you -build with the default's from Kconfig, then BIC will be builtin (not a module) -and it will end up the default. +so if you built everything as modules, the default will be reno. If you +build with the defaults from Kconfig, then CUBIC will be builtin (not a +module) and it will end up the default. If you really want a particular default value then you will need to set it with the sysctl. If you use a sysctl, the module will be autoloaded Be a better friend, newshound, and know-it-all with Yahoo! Mobile. Try it now. http://mobile.yahoo.com/;_ylt=Ahu06i62sR8HDtDypao8Wcj9tAcJ -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Bugme-new] [Bug 9923] New: Unable conect to internet over ISDN AVM USB BlueFritz
On Sat, 9 Feb 2008 03:36:26 -0800 (PST) [EMAIL PROTECTED] wrote: http://bugzilla.kernel.org/show_bug.cgi?id=9923 Summary: Unable conect to internet over ISDN AVM USB BlueFritz Product: Networking Version: 2.5 KernelVersion: 2.6.24 Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Other AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Latest working kernel version:2.6.22 Earliest failing kernel version:2.24 A regression. Distribution:opensuse 10.3 Hardware Environment:AVM BlueFritz USB ISDN Software Environment: Problem Description: ifup ippp0 ippp0 SIOCSIFFLAGS: Invalid argument Cannot enable interface ippp0 Steps to reproduce: Feb 9 11:20:54 linux-zhr0 klogd: ippp0: dialing 1 019193383... Feb 9 11:20:56 linux-zhr0 klogd: isdn_net: ippp0 connected Feb 9 11:20:56 linux-zhr0 klogd: capidrv-1: chan 0 up with ncci 0x10101 Feb 9 11:20:56 linux-zhr0 ipppd[5624]: Local number: 906138, Remote number: 019193383, Type: outgoing Feb 9 11:20:56 linux-zhr0 ipppd[5624]: PHASE_WAIT - PHASE_ESTABLISHED, ifunit: 0, linkunit: 0, fd: 7 Feb 9 11:20:56 linux-zhr0 ipppd[5624]: ioctl(SIOCSIFMTU): Invalid argument, 6 ippp0 1524. Feb 9 11:20:56 linux-zhr0 ipppd[5624]: MPPP negotiation, He: Yes We: Yes Feb 9 11:20:56 linux-zhr0 ipppd[5624]: CCP enabled! Trying CCP. Feb 9 11:20:56 linux-zhr0 ipppd[5624]: CCP: got ccp-unit 0 for link 0 (Compression Control Protocol) Feb 9 11:20:56 linux-zhr0 ipppd[5624]: ccp_resetci! Feb 9 11:20:56 linux-zhr0 ipppd[5624]: ccp_resetci! Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from peer slot(0) Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-rcv[0]: 01 01 00 09 11 05 00 01 04 Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from daemon: Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-xmit[0]: ff 03 80 fd 01 01 00 04 Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from daemon: Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-xmit[0]: ff 03 80 fd 04 01 00 09 11 05 00 01 04 Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from peer slot(0) Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-rcv[0]: 04 01 00 04 Feb 9 11:20:58 linux-zhr0 ipppd[5624]: ccp_resetci! Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from peer slot(0) Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-rcv[0]: 01 02 00 0a 11 06 00 01 01 03 Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from daemon: Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-xmit[0]: ff 03 80 fd 01 02 00 04 Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from daemon: Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-xmit[0]: ff 03 80 fd 04 02 00 0a 11 06 00 01 01 03 Feb 9 11:20:58 linux-zhr0 klogd: Received CCP frame from peer slot(0) Feb 9 11:20:58 linux-zhr0 klogd: [0/0].ccp-rcv[0]: 04 02 00 04 Feb 9 11:20:59 linux-zhr0 ipppd[5624]: local IP address 149.225.68.4 Feb 9 11:20:59 linux-zhr0 ipppd[5624]: remote IP address 139.4.250.4 Feb 9 11:20:59 linux-zhr0 ipppd[5624]: Ifup: ioctl(SIOCSIFFLAGS): Invalid argument Feb 9 11:20:59 linux-zhr0 ip-down: SIOCSIFFLAGS: Invalid argument -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH][AX25] ax25_ds_timer: use mod_timer instead of add_timer
Hi,
With AX25 patches applied I still get this possible circular locking
message.
Regards,
Bernard P.
===
[ INFO: possible circular locking dependency detected ]
2.6.24 #3
---
swapper/0 is trying to acquire lock:
(ax25_list_lock){-+..}, at: [f91dd3b1] ax25_destroy_socket+0x171/0x1f0 [ax25]
but task is already holding lock:
(slock-AF_AX25){-+..}, at: [f91dbabc] ax25_std_heartbeat_expiry+0x1c/0xe0
[ax25]
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
- #1 (slock-AF_AX25){-+..}:
[c014c8ca] __lock_acquire+0xc4a/0x10d0
[c014cdd1] lock_acquire+0x81/0xa0
[c03280e2] _spin_lock+0x32/0x60
[f91dce3a] ax25_info_show+0x24a/0x2c0 [ax25]
[c01a4aa1] seq_read+0xa1/0x2a0
[c01c20fd] proc_reg_read+0x5d/0x90
[c018a41a] vfs_read+0xaa/0x130
[c018a8ed] sys_read+0x3d/0x70
[c01042ae] sysenter_past_esp+0x5f/0xa5
[] 0x
- #0 (ax25_list_lock){-+..}:
[c014c6f1] __lock_acquire+0xa71/0x10d0
[c014cdd1] lock_acquire+0x81/0xa0
[c0328143] _spin_lock_bh+0x33/0x60
[f91dd3b1] ax25_destroy_socket+0x171/0x1f0 [ax25]
[f91dbaf3] ax25_std_heartbeat_expiry+0x53/0xe0 [ax25]
[f91dc5ab] ax25_heartbeat_expiry+0x1b/0x40 [ax25]
[c01325dd] run_timer_softirq+0x15d/0x1c0
[c012e343] __do_softirq+0x93/0x120
[c012e427] do_softirq+0x57/0x60
[c012e868] irq_exit+0x48/0x60
[c0119b3b] smp_apic_timer_interrupt+0x5b/0x90
[c0104e27] apic_timer_interrupt+0x33/0x38
[c0102512] mwait_idle+0x12/0x20
[c0102631] cpu_idle+0x71/0xc0
[c0325549] rest_init+0x49/0x50
[c0427a9a] start_kernel+0x2ea/0x370
[] 0x0
[] 0x
other info that might help us debug this:
1 lock held by swapper/0:
#0: (slock-AF_AX25){-+..}, at: [f91dbabc]
ax25_std_heartbeat_expiry+0x1c/0xe0 [ax25]
stack backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24 #3
[c01053da] show_trace_log_lvl+0x1a/0x30
[c0105e12] show_trace+0x12/0x20
[c01067cc] dump_stack+0x6c/0x80
[c014a32f] print_circular_bug_tail+0x6f/0x80
[c014c6f1] __lock_acquire+0xa71/0x10d0
[c014cdd1] lock_acquire+0x81/0xa0
[c0328143] _spin_lock_bh+0x33/0x60
[f91dd3b1] ax25_destroy_socket+0x171/0x1f0 [ax25]
[f91dbaf3] ax25_std_heartbeat_expiry+0x53/0xe0 [ax25]
[f91dc5ab] ax25_heartbeat_expiry+0x1b/0x40 [ax25]
[c01325dd] run_timer_softirq+0x15d/0x1c0
[c012e343] __do_softirq+0x93/0x120
[c012e427] do_softirq+0x57/0x60
[c012e868] irq_exit+0x48/0x60
[c0119b3b] smp_apic_timer_interrupt+0x5b/0x90
[c0104e27] apic_timer_interrupt+0x33/0x38
[c0102512] mwait_idle+0x12/0x20
[c0102631] cpu_idle+0x71/0xc0
[c0325549] rest_init+0x49/0x50
[c0427a9a] start_kernel+0x2ea/0x370
[] 0x0
===
Re: [PATCH][AX25] ax25_ds_timer: use mod_timer instead of add_timer
On Sat, Feb 09, 2008 at 07:44:50PM +0100, Bernard Pidoux F6BVP wrote: Hi, With AX25 patches applied I still get this possible circular locking message. Hi Bernard, Could you confirm which exactly patches did you try? Is this vanilla 2.6.24 plus these two: ax25_timer and ax25_ds_timer or something more? And I'm not sure what do you mean by still: the warning came back just after these last patches? At least these timer patches don't seem to change anything around locking? Thanks for testing this, Jarek P. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [resend] 3c509: convert to isa_driver and pnp_driver v4
On Sat, 9 Feb 2008 22:33:07 +0100
Ondrej Zary [EMAIL PROTECTED] wrote:
Hello,
this patch converts 3c509 driver to isa_driver and pnp_driver. The result is
that autoloading using udev and hibernation works with ISA PnP cards. It also
adds hibernation support for non-PnP ISA cards.
xcvr module parameter was removed as its value was not used.
Tested using 3 ISA cards in various combinations of PnP and non-PnP modes.
EISA and MCA only compile-tested.
Signed-off-by: Ondrej Zary [EMAIL PROTECTED]
--- linux-2.6.24-orig/drivers/net/3c509.c 2008-01-27 19:48:19.0
+0100
+++ linux-2.6.24-pentium/drivers/net/3c509.c 2008-02-07 17:58:45.0
+0100
@@ -54,25 +54,24 @@
v1.19a 28Oct2002 Davud Ruggiero [EMAIL PROTECTED]
- Increase *read_eeprom udelay to workaround oops with
2 cards.
v1.19b 08Nov2002 Marc Zyngier [EMAIL PROTECTED]
- - Introduce driver model for EISA cards.
+ - Introduce driver model for EISA cards.
+ v1.20 04Feb2008 Ondrej Zary [EMAIL PROTECTED]
+ - convert to isa_driver and pnp_driver and some cleanups
*/
Don't bother with comment, kernel uses git change log to figure out
who to blame.
#define DRV_NAME 3c509
-#define DRV_VERSION 1.19b
-#define DRV_RELDATE 08Nov2002
+#define DRV_VERSION 1.20
+#define DRV_RELDATE 04Feb2008
/* A few values that may be tweaked. */
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (400*HZ/1000)
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 10;
#include linux/module.h
-#ifdef CONFIG_MCA
#include linux/mca.h
-#endif
-#include linux/isapnp.h
+#include linux/isa.h
+#include linux/pnp.h
#include linux/string.h
#include linux/interrupt.h
#include linux/errno.h
@@ -97,10 +96,6 @@
static char version[] __initdata = DRV_NAME .c: DRV_VERSION
DRV_RELDATE [EMAIL PROTECTED];
-#if defined(CONFIG_PM) (defined(CONFIG_MCA) || defined(CONFIG_EISA))
-#define EL3_SUSPEND
-#endif
-
#ifdef EL3_DEBUG
static int el3_debug = EL3_DEBUG;
#else
@@ -111,6 +106,7 @@
* a global variable so that the mca/eisa probe routines can increment
* it */
static int el3_cards = 0;
+#define EL3_MAX_CARDS 8
/* To minimize the size of the driver source I only define operating
constants if they are used several times. You'll need the manual
@@ -119,7 +115,7 @@
#define EL3_DATA 0x00
#define EL3_CMD 0x0e
#define EL3_STATUS 0x0e
-#define EEPROM_READ 0x80
+#define EEPROM_READ 0x80
#define EL3_IO_EXTENT16
@@ -168,23 +164,31 @@
*/
#define SKB_QUEUE_SIZE 64
+typedef enum { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA } el3_cardtype;
+
No typedef please (see checkpatch)
struct el3_private {
struct net_device_stats stats;
Use network device stats in net_device now
- struct net_device *next_dev;
spinlock_t lock;
/* skb send-queue */
int head, size;
struct sk_buff *queue[SKB_QUEUE_SIZE];
What about sk_buff_head (linked list instead)?
- enum {
- EL3_MCA,
- EL3_PNP,
- EL3_EISA,
- } type; /* type of device */
- struct device *dev;
+ el3_cardtype type;
};
-static int id_port __initdata = 0x110; /* Start with 0x110 to avoid
new sound cards.*/
-static struct net_device *el3_root_dev;
+static int id_port;
+static int current_tag;
+static struct net_device *el3_devs[EL3_MAX_CARDS];
I know is only ISA, but having a limit seems silly, can't the device just
use allocated space like other drivers.
+
+/* Parameters that may be passed into the module. */
+static int debug = -1;
+static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1};
+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+static int max_interrupt_work = 10;
+#ifdef CONFIG_PNP
+static int nopnp;
+#endif
--
Stephen Hemminger [EMAIL PROTECTED]
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [resend] 3c509: convert to isa_driver and pnp_driver v4
Hello,
this patch converts 3c509 driver to isa_driver and pnp_driver. The result is
that autoloading using udev and hibernation works with ISA PnP cards. It also
adds hibernation support for non-PnP ISA cards.
xcvr module parameter was removed as its value was not used.
Tested using 3 ISA cards in various combinations of PnP and non-PnP modes.
EISA and MCA only compile-tested.
Signed-off-by: Ondrej Zary [EMAIL PROTECTED]
--- linux-2.6.24-orig/drivers/net/3c509.c 2008-01-27 19:48:19.0
+0100
+++ linux-2.6.24-pentium/drivers/net/3c509.c2008-02-07 17:58:45.0
+0100
@@ -54,25 +54,24 @@
v1.19a 28Oct2002 Davud Ruggiero [EMAIL PROTECTED]
- Increase *read_eeprom udelay to workaround oops with
2 cards.
v1.19b 08Nov2002 Marc Zyngier [EMAIL PROTECTED]
- - Introduce driver model for EISA cards.
+ - Introduce driver model for EISA cards.
+ v1.20 04Feb2008 Ondrej Zary [EMAIL PROTECTED]
+ - convert to isa_driver and pnp_driver and some cleanups
*/
#define DRV_NAME 3c509
-#define DRV_VERSION1.19b
-#define DRV_RELDATE08Nov2002
+#define DRV_VERSION1.20
+#define DRV_RELDATE04Feb2008
/* A few values that may be tweaked. */
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (400*HZ/1000)
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 10;
#include linux/module.h
-#ifdef CONFIG_MCA
#include linux/mca.h
-#endif
-#include linux/isapnp.h
+#include linux/isa.h
+#include linux/pnp.h
#include linux/string.h
#include linux/interrupt.h
#include linux/errno.h
@@ -97,10 +96,6 @@
static char version[] __initdata = DRV_NAME .c: DRV_VERSION DRV_RELDATE
[EMAIL PROTECTED];
-#if defined(CONFIG_PM) (defined(CONFIG_MCA) || defined(CONFIG_EISA))
-#define EL3_SUSPEND
-#endif
-
#ifdef EL3_DEBUG
static int el3_debug = EL3_DEBUG;
#else
@@ -111,6 +106,7 @@
* a global variable so that the mca/eisa probe routines can increment
* it */
static int el3_cards = 0;
+#define EL3_MAX_CARDS 8
/* To minimize the size of the driver source I only define operating
constants if they are used several times. You'll need the manual
@@ -119,7 +115,7 @@
#define EL3_DATA 0x00
#define EL3_CMD 0x0e
#define EL3_STATUS 0x0e
-#define EEPROM_READ 0x80
+#defineEEPROM_READ 0x80
#define EL3_IO_EXTENT 16
@@ -168,23 +164,31 @@
*/
#define SKB_QUEUE_SIZE 64
+typedef enum { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA } el3_cardtype;
+
struct el3_private {
struct net_device_stats stats;
- struct net_device *next_dev;
spinlock_t lock;
/* skb send-queue */
int head, size;
struct sk_buff *queue[SKB_QUEUE_SIZE];
- enum {
- EL3_MCA,
- EL3_PNP,
- EL3_EISA,
- } type; /* type of device */
- struct device *dev;
+ el3_cardtype type;
};
-static int id_port __initdata = 0x110; /* Start with 0x110 to avoid new sound
cards.*/
-static struct net_device *el3_root_dev;
+static int id_port;
+static int current_tag;
+static struct net_device *el3_devs[EL3_MAX_CARDS];
+
+/* Parameters that may be passed into the module. */
+static int debug = -1;
+static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1};
+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+static int max_interrupt_work = 10;
+#ifdef CONFIG_PNP
+static int nopnp;
+#endif
+static int __init el3_common_init(struct net_device *dev);
+static void el3_common_remove (struct net_device *dev);
static ushort id_read_eeprom(int index);
static ushort read_eeprom(int ioaddr, int index);
static int el3_open(struct net_device *dev);
@@ -199,23 +203,277 @@
static void el3_down(struct net_device *dev);
static void el3_up(struct net_device *dev);
static const struct ethtool_ops ethtool_ops;
-#ifdef EL3_SUSPEND
+#ifdef CONFIG_PM
static int el3_suspend(struct device *, pm_message_t);
static int el3_resume(struct device *);
-#else
-#define el3_suspend NULL
-#define el3_resume NULL
#endif
/* generic device remove for all device types */
-#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
static int el3_device_remove (struct device *device);
-#endif
#ifdef CONFIG_NET_POLL_CONTROLLER
static void el3_poll_controller(struct net_device *dev);
#endif
+/* Return 0 on success, 1 on error, 2 when found already detected PnP card */
+static int el3_isa_id_sequence(__be16 *phys_addr)
+{
+ short lrs_state = 0xff;
+ int i;
+
+ /* ISA boards are detected by sending the ID sequence to the
+ ID_PORT. We find cards past the first by setting the 'current_tag'
+ on cards as they are found. Cards with their tag set will not
+ respond to subsequent ID sequences. */
+
+ outb(0x00, id_port);
+ outb(0x00,
[RFC] ipvs: Cleanup sync daemon code
Hi all,
I'd like to get your feedback on this:
- Use kthread_run instead of doing a double-fork via kernel_thread()
- Return proper error codes to user-space on failures
Currently ipvsadm --start-daemon with an invalid --mcast-interface will
silently suceed. With these changes we get an appropriate No such device
error.
- Use wait queues for both master and backup thread
Instead of doing an endless loop with sleeping for one second, we now use
wait queues. The master sync daemon has its own wait queue and gets woken
up when we have enough data to sent and also at a regular interval. The
backup sync daemon sits on the wait queue of the mcast socket and gets
woken up as soon as we have data to process.
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 56f3c94..519bd96 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -890,6 +890,7 @@ extern char ip_vs_backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
extern int start_sync_thread(int state, char *mcast_ifn, __u8 syncid);
extern int stop_sync_thread(int state);
extern void ip_vs_sync_conn(struct ip_vs_conn *cp);
+extern void ip_vs_sync_init(void);
/*
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
index 963981a..0ccee4b 100644
--- a/net/ipv4/ipvs/ip_vs_core.c
+++ b/net/ipv4/ipvs/ip_vs_core.c
@@ -1071,6 +1071,8 @@ static int __init ip_vs_init(void)
{
int ret;
+ ip_vs_sync_init();
+
ret = ip_vs_control_init();
if (ret 0) {
IP_VS_ERR(can't setup control.\n);
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
index 948378d..36063d3 100644
--- a/net/ipv4/ipvs/ip_vs_sync.c
+++ b/net/ipv4/ipvs/ip_vs_sync.c
@@ -29,6 +29,9 @@
#include linux/in.h
#include linux/igmp.h /* for ip_mc_join_group */
#include linux/udp.h
+#include linux/kthread.h
+#include linux/wait.h
+#include linux/err.h
#include net/ip.h
#include net/sock.h
@@ -68,7 +71,8 @@ struct ip_vs_sync_conn_options {
};
struct ip_vs_sync_thread_data {
- struct completion *startup;
+ struct completion *startup; /* set to NULL once completed */
+ int *retval; /* only valid until startup is completed */
int state;
};
@@ -123,9 +127,10 @@ struct ip_vs_sync_buff {
};
-/* the sync_buff list head and the lock */
+/* the sync_buff list head, the lock and the counter */
static LIST_HEAD(ip_vs_sync_queue);
static DEFINE_SPINLOCK(ip_vs_sync_lock);
+static unsigned int ip_vs_sync_count;
/* current sync_buff for accepting new conn entries */
static struct ip_vs_sync_buff *curr_sb = NULL;
@@ -140,6 +145,13 @@ volatile int ip_vs_backup_syncid = 0;
char ip_vs_master_mcast_ifn[IP_VS_IFNAME_MAXLEN];
char ip_vs_backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
+/* sync daemon tasks */
+static struct task_struct *sync_master_thread;
+static struct task_struct *sync_backup_thread;
+
+/* wait queue for master sync daemon */
+static DECLARE_WAIT_QUEUE_HEAD(sync_master_wait);
+
/* multicast addr */
static struct sockaddr_in mcast_addr;
@@ -148,6 +160,8 @@ static inline void sb_queue_tail(struct ip_vs_sync_buff *sb)
{
spin_lock(ip_vs_sync_lock);
list_add_tail(sb-list, ip_vs_sync_queue);
+ if (++ip_vs_sync_count == 10)
+ wake_up_interruptible(sync_master_wait);
spin_unlock(ip_vs_sync_lock);
}
@@ -163,6 +177,7 @@ static inline struct ip_vs_sync_buff * sb_dequeue(void)
struct ip_vs_sync_buff,
list);
list_del(sb-list);
+ ip_vs_sync_count--;
}
spin_unlock_bh(ip_vs_sync_lock);
@@ -536,14 +551,17 @@ static int bind_mcastif_addr(struct socket *sock, char
*ifname)
static struct socket * make_send_sock(void)
{
struct socket *sock;
+ int result;
/* First create a socket */
- if (sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, sock) 0) {
+ result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, sock);
+ if (result 0) {
IP_VS_ERR(Error during creation of socket; terminating\n);
- return NULL;
+ return ERR_PTR(result);
}
- if (set_mcast_if(sock-sk, ip_vs_master_mcast_ifn) 0) {
+ result = set_mcast_if(sock-sk, ip_vs_master_mcast_ifn);
+ if (result 0) {
IP_VS_ERR(Error setting outbound mcast interface\n);
goto error;
}
@@ -551,14 +569,16 @@ static struct socket * make_send_sock(void)
set_mcast_loop(sock-sk, 0);
set_mcast_ttl(sock-sk, 1);
- if (bind_mcastif_addr(sock, ip_vs_master_mcast_ifn) 0) {
+ result = bind_mcastif_addr(sock, ip_vs_master_mcast_ifn);
+ if (result 0) {
IP_VS_ERR(Error binding address of the mcast interface\n);
goto error;
}
- if (sock-ops-connect(sock,
- (struct sockaddr*)mcast_addr,
- sizeof(struct
[PATCH][AX25] af_ax25: remove sock lock in ax25_info_show()
On Sat, Feb 09, 2008 at 07:44:50PM +0100, Bernard Pidoux F6BVP wrote:
Hi,
With AX25 patches applied I still get this possible circular locking
message.
IMHO this warning could happen earlier too...
Thanks,
Jarek P.
--
Subject: [AX25] af_ax25: remove sock lock in ax25_info_show()
This lockdep warning:
===
[ INFO: possible circular locking dependency detected ]
2.6.24 #3
---
swapper/0 is trying to acquire lock:
(ax25_list_lock){-+..}, at: [f91dd3b1] ax25_destroy_socket+0x171/0x1f0
[ax25]
but task is already holding lock:
(slock-AF_AX25){-+..}, at: [f91dbabc] ax25_std_heartbeat_expiry+0x1c/0xe0
[ax25]
which lock already depends on the new lock.
...
shows that ax25_list_lock and slock-AF_AX25 are taken in different
order: ax25_info_show() takes slock (bh_lock_sock(ax25-sk)) while
ax25_list_lock is held, so reversely to other functions. To fix this
the sock lock should be moved to ax25_info_start(), but since it's
only for reading proc info it seems this is not necessary (e.g.
ax25_send_to_raw() does similar reading without this lock too). So,
this patch removes this lock to avoid deadlock possibility.
Reported-by: Bernard Pidoux F6BVP [EMAIL PROTECTED]
Signed-off-by: Jarek Poplawski [EMAIL PROTECTED]
---
net/ax25/af_ax25.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 94b2b1b..68b5171 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1924,12 +1924,10 @@ static int ax25_info_show(struct seq_file *seq, void *v)
ax25-paclen);
if (ax25-sk != NULL) {
- bh_lock_sock(ax25-sk);
seq_printf(seq, %d %d %ld\n,
atomic_read(ax25-sk-sk_wmem_alloc),
atomic_read(ax25-sk-sk_rmem_alloc),
ax25-sk-sk_socket != NULL ?
SOCK_INODE(ax25-sk-sk_socket)-i_ino : 0L);
- bh_unlock_sock(ax25-sk);
} else {
seq_puts(seq, * * *\n);
}
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [resend] 3c509: convert to isa_driver and pnp_driver v4
On Saturday 09 February 2008 22:48:05 Stephen Hemminger wrote:
On Sat, 9 Feb 2008 22:33:07 +0100
Ondrej Zary [EMAIL PROTECTED] wrote:
Hello,
this patch converts 3c509 driver to isa_driver and pnp_driver. The result
is that autoloading using udev and hibernation works with ISA PnP cards.
It also adds hibernation support for non-PnP ISA cards.
xcvr module parameter was removed as its value was not used.
Tested using 3 ISA cards in various combinations of PnP and non-PnP
modes. EISA and MCA only compile-tested.
Signed-off-by: Ondrej Zary [EMAIL PROTECTED]
--- linux-2.6.24-orig/drivers/net/3c509.c 2008-01-27 19:48:19.0
+0100 +++ linux-2.6.24-pentium/drivers/net/3c509.c 2008-02-07
17:58:45.0 +0100 @@ -54,25 +54,24 @@
v1.19a 28Oct2002 Davud Ruggiero [EMAIL PROTECTED]
- Increase *read_eeprom udelay to workaround oops with
2 cards.
v1.19b 08Nov2002 Marc Zyngier [EMAIL PROTECTED]
- - Introduce driver model for EISA cards.
+ - Introduce driver model for EISA cards.
+ v1.20 04Feb2008 Ondrej Zary [EMAIL PROTECTED]
+ - convert to isa_driver and pnp_driver and some cleanups
*/
Don't bother with comment, kernel uses git change log to figure out
who to blame.
#define DRV_NAME 3c509
-#define DRV_VERSION1.19b
-#define DRV_RELDATE08Nov2002
+#define DRV_VERSION1.20
+#define DRV_RELDATE04Feb2008
/* A few values that may be tweaked. */
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (400*HZ/1000)
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 10;
#include linux/module.h
-#ifdef CONFIG_MCA
#include linux/mca.h
-#endif
-#include linux/isapnp.h
+#include linux/isa.h
+#include linux/pnp.h
#include linux/string.h
#include linux/interrupt.h
#include linux/errno.h
@@ -97,10 +96,6 @@
static char version[] __initdata = DRV_NAME .c: DRV_VERSION
DRV_RELDATE [EMAIL PROTECTED];
-#if defined(CONFIG_PM) (defined(CONFIG_MCA) || defined(CONFIG_EISA))
-#define EL3_SUSPEND
-#endif
-
#ifdef EL3_DEBUG
static int el3_debug = EL3_DEBUG;
#else
@@ -111,6 +106,7 @@
* a global variable so that the mca/eisa probe routines can increment
* it */
static int el3_cards = 0;
+#define EL3_MAX_CARDS 8
/* To minimize the size of the driver source I only define operating
constants if they are used several times. You'll need the manual
@@ -119,7 +115,7 @@
#define EL3_DATA 0x00
#define EL3_CMD 0x0e
#define EL3_STATUS 0x0e
-#define EEPROM_READ 0x80
+#defineEEPROM_READ 0x80
#define EL3_IO_EXTENT 16
@@ -168,23 +164,31 @@
*/
#define SKB_QUEUE_SIZE 64
+typedef enum { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA } el3_cardtype;
+
No typedef please (see checkpatch)
Is there any standard way to solve this without a typedef? I added
el3_dev_fill() function which fills that card type value according to a
parameter passed to it. int could be used instead and #define EL3_ISA
0, #define EL3_PNP 1 - but I think that's ugly.
struct el3_private {
struct net_device_stats stats;
Use network device stats in net_device now
OK, looks like the driver will need some more patches.
- struct net_device *next_dev;
spinlock_t lock;
/* skb send-queue */
int head, size;
struct sk_buff *queue[SKB_QUEUE_SIZE];
What about sk_buff_head (linked list instead)?
I don't know anything about this, maybe in next patch.
- enum {
- EL3_MCA,
- EL3_PNP,
- EL3_EISA,
- } type; /* type of device */
- struct device *dev;
+ el3_cardtype type;
};
-static int id_port __initdata = 0x110; /* Start with 0x110 to avoid new
sound cards.*/ -static struct net_device *el3_root_dev;
+static int id_port;
+static int current_tag;
+static struct net_device *el3_devs[EL3_MAX_CARDS];
I know is only ISA, but having a limit seems silly, can't the device just
use allocated space like other drivers.
EL3_MAX_CARDS is also used as a parameter to isa_register_driver(). The irq[]
array (see below) is limited to 8 devices too. And finally, the card itself
can use one of 8 different IRQs (3,5,7,2/9,10,11,12,15). So I think that it's
not worth adding more code to support more cards.
The original driver will do bad things with more than 8 cards too - read
beyond the end of irq[] array.
+
+/* Parameters that may be passed into the module. */
+static int debug = -1;
+static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1};
+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+static int max_interrupt_work = 10;
+#ifdef CONFIG_PNP
+static int nopnp;
+#endif
--
Ondrej Zary
--
To
[solved] Re: Bug? Kernels 2.6.2x drops TCP packets over wireless (independentofcard used)
Dnia 7 lutego 2008 20:24 Eric Dumazet [EMAIL PROTECTED] napisał(a): Typical window scaling problem here... (well, for previous traces, with wscaling of 5, since with wscale 2 it seems to work), you probably have a buggy router or something... http://lwn.net/Articles/92727/ Try : # echo 0 /proc/sys/net/ipv4/tcp_window_scaling And retry to connect to this ftp server You could alternativly play with /proc/sys/net/ipv4/tcp_rmem # echo 4096 8192 5 /proc/sys/net/ipv4/tcp_rmem Thanks! That solves the problem! Now I read about TCP window scaling and I understand the issue, but I wouldn't figure/google that out myself! Thank You for Your time! m. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC] ipvs: Cleanup sync daemon code
On Sun, Feb 10, 2008 at 12:38:11AM +0100, Sven Wegener wrote: Hi all, I'd like to get your feedback on this: - Use kthread_run instead of doing a double-fork via kernel_thread() - Return proper error codes to user-space on failures Currently ipvsadm --start-daemon with an invalid --mcast-interface will silently suceed. With these changes we get an appropriate No such device error. - Use wait queues for both master and backup thread Instead of doing an endless loop with sleeping for one second, we now use wait queues. The master sync daemon has its own wait queue and gets woken up when we have enough data to sent and also at a regular interval. The backup sync daemon sits on the wait queue of the mcast socket and gets woken up as soon as we have data to process. Hi Sven, This looks good to me, assuming that its tested and works. A few minor things: In sb_queue_tail() master loop is woken up if the ip_vs_sync_count reaches 10, which seems a bit arbitary. Perhaps its just my mail reader, but the patch seemed a bit screwy when I saved it to a file. I this fixed the problem I was seeing using s/^ / / Unfortuantely/Fortunately I am about to leave for a few days skiing, so if I am quiet you will know why. Acked-by: Simon Horman [EMAIL PROTECTED] -- Horms -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [resend] 3c509: convert to isa_driver and pnp_driver v4
On Sun, Feb 10, 2008 at 01:10:07AM +0100, Ondrej Zary wrote:
+typedef enum { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA } el3_cardtype;
+
No typedef please (see checkpatch)
Is there any standard way to solve this without a typedef? I added
el3_dev_fill() function which fills that card type value according to a
parameter passed to it. int could be used instead and #define EL3_ISA
0, #define EL3_PNP 1 - but I think that's ugly.
enum el3_cardtype {
EL3_ISA,
EL3_PNP,
EL3_MCA,
EL3_EISA,
};
struct el3_private {
struct net_device_stats stats;
Use network device stats in net_device now
OK, looks like the driver will need some more patches.
While I agree with Stephens comment that this driver should be using
the stats in net_device that's totally out of scope for this patch.
As you're the defacto maintainer of this driver now it would be nice
if you could submit another one for it.
- struct net_device *next_dev;
spinlock_t lock;
/* skb send-queue */
int head, size;
struct sk_buff *queue[SKB_QUEUE_SIZE];
What about sk_buff_head (linked list instead)?
I don't know anything about this, maybe in next patch.
Yes, separate patch please.
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC] ipvs: Cleanup sync daemon code
On Sun, Feb 10, 2008 at 12:38:11AM +0100, Sven Wegener wrote:
struct ip_vs_sync_thread_data {
- struct completion *startup;
+ struct completion *startup; /* set to NULL once completed */
This is not needed anmore. kthread_run guarantees that the newly
creates thread is run before returning to the caller.
+/* wait queue for master sync daemon */
+static DECLARE_WAIT_QUEUE_HEAD(sync_master_wait);
I don't think you need this one either. You can use wake_up_process
on the task_struct pointer instead.
spin_lock(ip_vs_sync_lock);
list_add_tail(sb-list, ip_vs_sync_queue);
+ if (++ip_vs_sync_count == 10)
+ wake_up_interruptible(sync_master_wait);
spin_unlock(ip_vs_sync_lock);
}
-static int sync_thread(void *startup)
+static int sync_thread(void *data)
Btw, it might make sense to remove sync_thread and just call the
master and backup threads directly.
+void __init ip_vs_sync_init(void)
+{
+ /* set up multicast address */
+ mcast_addr.sin_family = AF_INET;
+ mcast_addr.sin_port = htons(IP_VS_SYNC_PORT);
+ mcast_addr.sin_addr.s_addr = htonl(IP_VS_SYNC_GROUP);
}
Why can't this be initialized at compile time by:
static struct sockaddr_in mcast_addr = {
.sin_family = AF_INET,
.sin_port = htons(IP_VS_SYNC_PORT),
.sin_addr.s_addr= htonl(IP_VS_SYNC_GROUP),
}
(the hton* might need __constant_hton* also I'm not sure without trying)
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 3/7] bnx2x section fix
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:15 -0800 From: Andrew Morton [EMAIL PROTECTED] gcc-3.4.4 on powerpc: drivers/net/bnx2x.c:73: error: version causes a section type conflict Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Sam Ravnborg [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 4/7] bnx2.c section fix
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:15 -0800 From: Andrew Morton [EMAIL PROTECTED] gcc-3.4.4 on powerpc: drivers/net/bnx2.c:67: error: version causes a section type conflict Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Sam Ravnborg [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 7/7] pppol2tp: fix printk warnings
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:17 -0800 From: Andrew Morton [EMAIL PROTECTED] ... Not all platforms implement u64 with unsigned long long. eg: powerpc. Cc: Jeff Garzik [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2][KEY]: Clean up proc files creation a bit.
From: Pavel Emelyanov [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 15:11:32 +0300 Mainly this removes ifdef-s from inside the ipsec_pfkey_init. Signed-off-by: Pavel Emelyanov [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PKT_SCHED] deinline functions in meta match
From: Stephen Hemminger [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 09:55:57 -0800 A couple of functions in meta match don't need to be inline. Signed-off-by: Stephen Hemminger [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2][SCTP]: Use snmp_fold_field instead of a homebrew analogue.
From: Vlad Yasevich [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 09:59:54 -0500 Pavel Emelyanov wrote: SCPT already depends in INET, so this doesn't create additional dependencies. Signed-off-by: Pavel Emelyanov [EMAIL PROTECTED] Acked-by: Vlad Yasevich [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [IGMP]: Optimize kfree_skb in igmp_rcv.
From: Denis V. Lunev [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 17:14:17 +0300 Merge error paths inside igmp_rcv. Signed-off-by: Denis V. Lunev [EMAIL PROTECTED] Applied, but this kind of cleanup is borderline during this time period. Please queue such things up for when I open up net-2.6.26, thanks. Find some bugs to fix instead :-) -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2][KEY]: Convert net/pfkey to use seq files.
From: Pavel Emelyanov [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 15:14:06 +0300 The seq files API disposes the caller of the difficulty of checking file position, the length of data to produce and the size of provided buffer. Signed-off-by: Pavel Emelyanov [EMAIL PROTECTED] Applied, but this kind of stuff is borderline wrt. the no new features declaration. Please queue future instances of this kind of stuff for when I open up net-2.6.26, thanks. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2][SCTP]: Convert sctp_dbg_objcnt to seq files.
From: Vlad Yasevich [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 10:00:23 -0500 Pavel Emelyanov wrote: This makes the code use a good proc API and the text ~50 bytes shorter. Signed-off-by: Pavel Emelyanov [EMAIL PROTECTED] Acked-by: Vlad Yasevich [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PKT_SCHED] ematch: tcf_em_destroy robustness
From: Stephen Hemminger [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 10:48:32 -0800 Make the code in tcf_em_tree_destroy more robust and cleaner: * Don't need to cast pointer to kfree() or avoid passing NULL. * After freeing the tree, clear the pointer to avoid possible problems from repeated free. Signed-off-by: Stephen Hemminger [EMAIL PROTECTED] Applied, thanks. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] isdn: fix section mismatch warning in hfc_sx.c
From: Sam Ravnborg [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 21:00:04 +0100 Fix the following warning: WARNING: drivers/isdn/hisax/built-in.o(.text+0x35818): Section mismatch in reference from the function hfcsx_card_msg() to the function .devinit.text:inithfcsx() hfcsx_card_msg() may be called outside __devinit context. Following the program logic is looks like the CARD_INIT branch will only be taken under __devinit context but to be consistent remove the __devinit annotation of inithfcsx() so we do not mix non-__devinit and __devinit code. Signed-off-by: Sam Ravnborg [EMAIL PROTECTED] Acked-by: Karsten Keil [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: David Miller [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] isdn: fix section mismatch warnings in isac.c and isar.c
From: Sam Ravnborg [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 21:00:03 +0100 Fix the following warnings: ... initisar(), initisac() and clear_pending_isac_ints() were all used via a cardmsg fnction - which may be called ouside __devinit context. So remove the bogus __devinit annotation of the above three functions to fix the warnings. Signed-off-by: Sam Ravnborg [EMAIL PROTECTED] Acked-by: Karsten Keil [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: David Miller [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] isdn: fix section mismatch warnings from hisax_cs_setup_card
From: Sam Ravnborg [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 21:00:01 +0100 Fix the following warnings: ... checkcard() are the only user of hisax_cs_setup_card(). And checkcard is only used during init or when hot plugging ISDN devices. So annotate hisax_cs_setup_card() with __devinit. checkcard() is used by exported functions so it cannot be annotated __devinit. Annotate it with __ref so modpost ignore references to _devinit section. Signed-off-by: Sam Ravnborg [EMAIL PROTECTED] Acked-by: Karsten Keil [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: David Miller [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] isdn: fix section mismatch warning for ISACVer
From: Sam Ravnborg [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 21:00:02 +0100 Fix following warnings: WARNING: drivers/isdn/hisax/built-in.o(.text+0x19723): Section mismatch in reference from the function ISACVersion() to the variable .devinit.data:ISACVer WARNING: drivers/isdn/hisax/built-in.o(.text+0x2005b): Section mismatch in reference from the function setup_avm_a1_pcmcia() to the function .devinit.text:setup_isac() ISACVer were only used from function annotated __devinit so add same annotation to ISACVer. One af the fererencing functions missed __devinit so add it and kill an additional warning. Signed-off-by: Sam Ravnborg [EMAIL PROTECTED] Acked-by: Karsten Keil [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: David Miller [EMAIL PROTECTED] Also applied, thanks a lot Sam! -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 1/7] typhoon section fix
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:13 -0800 From: Andrew Morton [EMAIL PROTECTED] gcc-3.4.4 on powerpc: drivers/net/typhoon.c:137: error: version causes a section type conflict Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Sam Ravnborg [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2/7] natsemi section fix
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:15 -0800 From: Andrew Morton [EMAIL PROTECTED] gcc-3.4.4 on powerpc: drivers/net/natsemi.c:245: error: natsemi_pci_info causes a section type conflict Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Sam Ravnborg [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 5/7] via-velocity section fix
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:16 -0800 From: Andrew Morton [EMAIL PROTECTED] gcc-3.4.4 on powerpc: drivers/net/via-velocity.c:443: error: chip_info_table causes a section type conflict on this one I had to remove the __devinitdata too. Don't know why. Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Sam Ravnborg [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 6/7] starfire secton fix
From: [EMAIL PROTECTED] Date: Fri, 08 Feb 2008 03:11:16 -0800 From: Andrew Morton [EMAIL PROTECTED] gcc-3.4.4 on powerpc: drivers/net/starfire.c:219: error: version causes a section type conflict Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Sam Ravnborg [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Applied. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [IPV6] Replace using the magic constant 1024 with IP6_RT_PRIO_USER for fc_metric.
From: Rami Rosen [EMAIL PROTECTED] Date: Fri, 8 Feb 2008 12:14:18 +0200 This patch replaces the explicit usage of the magic constant 1024 with IP6_RT_PRIO_USER in the IPV6 tree. Signed-off-by: Rami Rosen [EMAIL PROTECTED] Applied, thanks. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
