* Re: [2.6.15-rc1] VFS: file-max limit 400490 reached
From: Jeff Garzik @ 2005-11-12 6:03 UTC (permalink / raw)
To: Linux Kernel, Netdev List
In-Reply-To: <43757D18.9090109@pobox.com>
[-- Attachment #1: Type: text/plain, Size: 441 bytes --]
Jeff Garzik wrote:
>
> I rebooted my RHEL4-based ipv4/ipv6 gateway/server into 2.6.15-rc1, and
> very soon the box was brought to its knees, spewing
>
> VFS: file-max limit 400490 reached
Follow-up: I may have excised too much from the head of the log I posted.
It now looks like the radvd troubles may have started with a link
up/down event.
Attached is some additional lines found at the -head- of the previously
posted log.
[-- Attachment #2: log2.txt --]
[-- Type: text/plain, Size: 2485 bytes --]
Nov 11 22:38:32 pretzel dhcpd: dhcpd startup succeeded
Nov 11 22:38:33 pretzel exim: exim startup succeeded
Nov 11 22:38:34 pretzel httpd: httpd startup succeeded
Nov 11 22:38:34 pretzel crond: crond startup succeeded
Nov 11 22:38:34 pretzel anacron: anacron startup succeeded
Nov 11 22:38:35 pretzel atd: atd startup succeeded
Nov 11 22:38:40 pretzel login(pam_unix)[4705]: session opened for user root by LOGIN(uid=0)
Nov 11 22:38:40 pretzel -- root[4705]: ROOT LOGIN ON tty1
Nov 11 22:38:55 pretzel login(pam_unix)[4705]: session closed for user root
Nov 11 22:45:54 pretzel sshd(pam_unix)[5241]: session opened for user jgarzik by (uid=0)
Nov 11 22:45:58 pretzel sshd(pam_unix)[5283]: session opened for user jgarzik by (uid=0)
Nov 11 23:01:01 pretzel crond(pam_unix)[28125]: session opened for user root by (uid=0)
Nov 11 23:01:02 pretzel crond(pam_unix)[28125]: session closed for user root
Nov 11 23:01:39 pretzel sshd(pam_unix)[29561]: session opened for user jgarzik by (uid=0)
Nov 11 23:01:48 pretzel sshd(pam_unix)[29561]: session closed for user jgarzik
Nov 11 23:34:00 pretzel kernel: e1000: eth1: e1000_watchdog_task: NIC Link is Down
Nov 11 23:34:01 pretzel netplugd[4112]: eth1: state ACTIVE flags 0x00001043 UP,BROADCAST,RUNNING,MULTICAST -> 0x00001003 UP,BROADCAST,MULTICAST
Nov 11 23:34:01 pretzel netplugd[25700]: /etc/netplug.d/netplug eth1 out -> pid 25700
Nov 11 23:34:01 pretzel radvd[4428]: resetting ipv6-allrouters membership on eth1
Nov 11 23:34:01 pretzel radvd[4428]: can't join ipv6-allrouters on eth1
Nov 11 23:34:07 pretzel kernel: e1000: eth1: e1000_watchdog_task: NIC Link is Up 1000 Mbps Full Duplex
Nov 11 23:34:07 pretzel netplugd[4112]: eth1: state OUTING flags 0x00001003 UP,BROADCAST,MULTICAST -> 0x00001043 UP,BROADCAST,RUNNING,MULTICAST
Nov 11 23:34:10 pretzel radvd[4428]: resetting ipv6-allrouters membership on eth1
Nov 11 23:34:10 pretzel radvd[4428]: can't join ipv6-allrouters on eth1
Nov 11 23:34:16 pretzel radvd[4428]: resetting ipv6-allrouters membership on eth1
Nov 11 23:34:16 pretzel radvd[4428]: can't join ipv6-allrouters on eth1
Nov 11 23:34:23 pretzel radvd[4428]: resetting ipv6-allrouters membership on eth1
Nov 11 23:34:23 pretzel radvd[4428]: can't join ipv6-allrouters on eth1
Nov 11 23:34:31 pretzel radvd[4428]: resetting ipv6-allrouters membership on eth1
Nov 11 23:34:31 pretzel radvd[4428]: can't join ipv6-allrouters on eth1
Nov 11 23:34:37 pretzel radvd[4428]: resetting ipv6-allrouters membership on eth1
[...]
^ permalink raw reply
* Re: [RFC: 2.6 patch] remove ISA legacy functions
From: Christoph Hellwig @ 2005-11-12 7:12 UTC (permalink / raw)
To: Adrian Bunk
Cc: Andrew Morton, linux-kernel, linux-scsi, netdev, jonathan,
tlinux-users, Jaroslav Kysela, viro
In-Reply-To: <20051112045216.GY5376@stusta.de>
On Sat, Nov 12, 2005 at 05:52:16AM +0100, Adrian Bunk wrote:
> This patch removes the ISA legacy functions that are deprecated since
> kernel 2.4 and that aren't available on all architectures.
>
> The 7 drivers that were still using this obsolete API are now marked
> as BROKEN.
NACK. Al has patches pending to convert them to proper APIs, please
wait until after that patchseries has landed.
^ permalink raw reply
* Re: Re: [PATCH] ebtables: Port ebt_[u]log.c to nf[netlink]_log
From: Harald Welte @ 2005-11-12 9:49 UTC (permalink / raw)
To: Bart De Schuymer
Cc: Linux Netdev List,
ebtables-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <1129648337.4504.3.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 8947 bytes --]
Sorry for this extremely delayed follow-up, but I just noticed that this
is the only patch in my 'master' branch that is not yet merged mainline.
On Tue, Oct 18, 2005 at 03:12:17PM +0000, Bart De Schuymer wrote:
> OK, but please fix the typo then. Shouldn't a similar comment be in
> ebt_ulog?
I've addressed both of your concerns (typo and similar comment/message
in ebt_ulog).
If you deem the attached patch fine, please submit it to davem.
[NETFILTER] ebtables: Support nf_log API from ebt_log and ebt_ulog
This makes ebt_log and ebt_ulog use the new nf_log api. This enables the
bridging packet filter to log packets e.g. via nfnetlink_log.
Signed-off-by: Harald Welte <laforge-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org>
diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -196,9 +196,13 @@ config BRIDGE_EBT_LOG
To compile it as a module, choose M here. If unsure, say N.
config BRIDGE_EBT_ULOG
- tristate "ebt: ulog support"
+ tristate "ebt: ulog support (OBSOLETE)"
depends on BRIDGE_NF_EBTABLES
help
+ This option enables the old bridge-specific "ebt_ulog" implementation
+ which has been obsoleted by the new "nfnetlink_log" code (see
+ CONFIG_NETFILTER_NETLINK_LOG).
+
This option adds the ulog watcher, that you can use in any rule
in any ebtables table. The packet is passed to a userspace
logging daemon using netlink multicast sockets. This differs
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -3,6 +3,7 @@
*
* Authors:
* Bart De Schuymer <bdschuym-LPO8gxj9N8aZIoH1IeqzKA@public.gmane.org>
+ * Harald Welte <laforge-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org>
*
* April, 2002
*
@@ -10,6 +11,7 @@
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_log.h>
+#include <linux/netfilter.h>
#include <linux/module.h>
#include <linux/ip.h>
#include <linux/if_arp.h>
@@ -55,17 +57,19 @@ static void print_MAC(unsigned char *p)
}
#define myNIPQUAD(a) a[0], a[1], a[2], a[3]
-static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
- const struct net_device *in, const struct net_device *out,
- const void *data, unsigned int datalen)
+static void
+ebt_log_packet(unsigned int pf, unsigned int hooknum,
+ const struct sk_buff *skb, const struct net_device *in,
+ const struct net_device *out, const struct nf_loginfo *loginfo,
+ const char *prefix)
{
- struct ebt_log_info *info = (struct ebt_log_info *)data;
char level_string[4] = "< >";
+ unsigned int bitmask;
- level_string[1] = '0' + info->loglevel;
+ level_string[1] = '0' + loginfo->u.log.level;
spin_lock_bh(&ebt_log_lock);
printk(level_string);
- printk("%s IN=%s OUT=%s ", info->prefix, in ? in->name : "",
+ printk("%s IN=%s OUT=%s ", prefix, in ? in->name : "",
out ? out->name : "");
printk("MAC source = ");
@@ -75,7 +79,12 @@ static void ebt_log(const struct sk_buff
printk("proto = 0x%04x", ntohs(eth_hdr(skb)->h_proto));
- if ((info->bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==
+ if (loginfo->type == NF_LOG_TYPE_LOG)
+ bitmask = loginfo->u.log.logflags;
+ else
+ bitmask = NF_LOG_MASK;
+
+ if ((bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==
htons(ETH_P_IP)){
struct iphdr _iph, *ih;
@@ -104,7 +113,7 @@ static void ebt_log(const struct sk_buff
goto out;
}
- if ((info->bitmask & EBT_LOG_ARP) &&
+ if ((bitmask & EBT_LOG_ARP) &&
((eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) ||
(eth_hdr(skb)->h_proto == htons(ETH_P_RARP)))) {
struct arphdr _arph, *ah;
@@ -144,6 +153,21 @@ static void ebt_log(const struct sk_buff
out:
printk("\n");
spin_unlock_bh(&ebt_log_lock);
+
+}
+
+static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
+ const struct net_device *in, const struct net_device *out,
+ const void *data, unsigned int datalen)
+{
+ struct ebt_log_info *info = (struct ebt_log_info *)data;
+ struct nf_loginfo li;
+
+ li.type = NF_LOG_TYPE_LOG;
+ li.u.log.level = info->loglevel;
+ li.u.log.logflags = info->bitmask;
+
+ nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, info->prefix);
}
static struct ebt_watcher log =
@@ -154,13 +178,32 @@ static struct ebt_watcher log =
.me = THIS_MODULE,
};
+static struct nf_logger ebt_log_logger = {
+ .name = "ebt_log",
+ .logfn = &ebt_log_packet,
+ .me = THIS_MODULE,
+};
+
static int __init init(void)
{
- return ebt_register_watcher(&log);
+ int ret;
+
+ ret = ebt_register_watcher(&log);
+ if (ret < 0)
+ return ret;
+ if (nf_log_register(PF_BRIDGE, &ebt_log_logger) < 0) {
+ printk(KERN_WARNING "ebt_log: not logging via system console "
+ "since somebody else already registered for PF_INET\n");
+ /* we cannot make module load fail here, since otherwise
+ * ebtables userspace would abort */
+ }
+
+ return 0;
}
static void __exit fini(void)
{
+ nf_log_unregister_logger(&ebt_log_logger);
ebt_unregister_watcher(&log);
}
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -3,6 +3,7 @@
*
* Authors:
* Bart De Schuymer <bdschuym-LPO8gxj9N8aZIoH1IeqzKA@public.gmane.org>
+ * Harald Welte <laforge-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org>
*
* November, 2004
*
@@ -115,14 +116,13 @@ static struct sk_buff *ulog_alloc_skb(un
return skb;
}
-static void ebt_ulog(const struct sk_buff *skb, unsigned int hooknr,
+static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
const struct net_device *in, const struct net_device *out,
- const void *data, unsigned int datalen)
+ const struct ebt_ulog_info *uloginfo, const char *prefix)
{
ebt_ulog_packet_msg_t *pm;
size_t size, copy_len;
struct nlmsghdr *nlh;
- struct ebt_ulog_info *uloginfo = (struct ebt_ulog_info *)data;
unsigned int group = uloginfo->nlgroup;
ebt_ulog_buff_t *ub = &ulog_buffers[group];
spinlock_t *lock = &ub->lock;
@@ -216,6 +216,39 @@ alloc_failure:
goto unlock;
}
+/* this function is registered with the netfilter core */
+static void ebt_log_packet(unsigned int pf, unsigned int hooknum,
+ const struct sk_buff *skb, const struct net_device *in,
+ const struct net_device *out, const struct nf_loginfo *li,
+ const char *prefix)
+{
+ struct ebt_ulog_info loginfo;
+
+ if (!li || li->type != NF_LOG_TYPE_ULOG) {
+ loginfo.nlgroup = EBT_ULOG_DEFAULT_NLGROUP;
+ loginfo.cprange = 0;
+ loginfo.qthreshold = EBT_ULOG_DEFAULT_QTHRESHOLD;
+ loginfo.prefix[0] = '\0';
+ } else {
+ loginfo.nlgroup = li->u.ulog.group;
+ loginfo.cprange = li->u.ulog.copy_len;
+ loginfo.qthreshold = li->u.ulog.qthreshold;
+ strlcpy(loginfo.prefix, prefix, sizeof(loginfo.prefix));
+ }
+
+ ebt_ulog_packet(hooknum, skb, in, out, &loginfo, prefix);
+}
+
+static void ebt_ulog(const struct sk_buff *skb, unsigned int hooknr,
+ const struct net_device *in, const struct net_device *out,
+ const void *data, unsigned int datalen)
+{
+ struct ebt_ulog_info *uloginfo = (struct ebt_ulog_info *)data;
+
+ ebt_ulog_packet(hooknr, skb, in, out, uloginfo, NULL);
+}
+
+
static int ebt_ulog_check(const char *tablename, unsigned int hookmask,
const struct ebt_entry *e, void *data, unsigned int datalen)
{
@@ -240,6 +273,12 @@ static struct ebt_watcher ulog = {
.me = THIS_MODULE,
};
+static struct nf_logger ebt_ulog_logger = {
+ .name = EBT_ULOG_WATCHER,
+ .logfn = &ebt_log_packet,
+ .me = THIS_MODULE,
+};
+
static int __init init(void)
{
int i, ret = 0;
@@ -265,6 +304,13 @@ static int __init init(void)
else if ((ret = ebt_register_watcher(&ulog)))
sock_release(ebtulognl->sk_socket);
+ if (nf_log_register(PF_BRIDGE, &ebt_ulog_logger) < 0) {
+ printk(KERN_WARNING "ebt_ulog: not logging via ulog "
+ "since somebody else already registered for PF_BRIDGE\n");
+ /* we cannot make module load fail here, since otherwise
+ * ebtables userspace would abort */
+ }
+
return ret;
}
@@ -273,6 +319,7 @@ static void __exit fini(void)
ebt_ulog_buff_t *ub;
int i;
+ nf_log_unregister_logger(&ebt_ulog_logger);
ebt_unregister_watcher(&ulog);
for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {
ub = &ulog_buffers[i];
--
- Harald Welte <laforge-TgoAw6mPHtdg9hUCZPvPmw@public.gmane.org> http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* [PATCH] [NETFILTER]: Allow SYN+PSH as valid flag combination
From: Harald Welte @ 2005-11-12 10:39 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Netdev List, netfilter-devel, vlad, kaber
In-Reply-To: <20051111.114801.112784817.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 2544 bytes --]
On Fri, Nov 11, 2005 at 11:48:01AM -0800, David S. Miller wrote:
> From: Patrick McHardy <kaber@trash.net>
> Date: Fri, 11 Nov 2005 14:58:01 +0100
>
> > Unfortunately this is unlikely to happen, and if Linux itself
> > accepts SYN|PSH, I don't see a reason why ip_conntrack shouldn't
> > as well.
>
> I totally agree.
Me, too. However, we also need to update nf_conntrack now:
[NETFILTER] {ip,nf}_conntrack TCP: Accept SYN+PUSH like SYN
Some devices (e.g. Qlogic iSCSI HBA hardware like QLA4010 up to firmware
3.0.0.4) initiates TCP with SYN and PUSH flags set.
The Linux TCP/IP stack deals fine with that, but the connection tracking
code doesn't.
This patch alters TCP connection tracking to accept SYN+PUSH as a valid
flag combination.
Signed-off-by: Vlad Drukker <vlad@storewiz.com>
Signed-off-by: Harald Welte <laforge@netfilter.org>
---
commit 933c4adfa34fbc151dd9908b2ce59335b22e6fe4
tree 041e7fc4116cd3b2774429cf8da9caee6e77a74b
parent 106c77b9b51b61bcd926ab5100761b2832791b74
author Harald Welte <laforge@netfilter.org> Sat, 12 Nov 2005 11:36:56 +0100
committer Harald Welte <laforge@netfilter.org> Sat, 12 Nov 2005 11:36:56 +0100
net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 1 +
net/netfilter/nf_conntrack_proto_tcp.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -814,6 +814,7 @@ static u8 tcp_valid_flags[(TH_FIN|TH_SYN
{
[TH_SYN] = 1,
[TH_SYN|TH_ACK] = 1,
+ [TH_SYN|TH_PUSH] = 1,
[TH_SYN|TH_ACK|TH_PUSH] = 1,
[TH_RST] = 1,
[TH_RST|TH_ACK] = 1,
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -779,6 +779,7 @@ static u8 tcp_valid_flags[(TH_FIN|TH_SYN
{
[TH_SYN] = 1,
[TH_SYN|TH_ACK] = 1,
+ [TH_SYN|TH_PUSH] = 1,
[TH_SYN|TH_ACK|TH_PUSH] = 1,
[TH_RST] = 1,
[TH_RST|TH_ACK] = 1,
--
- Harald Welte <laforge@netfilter.org> http://netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [-mm patch] drivers/net/wireless/tiacx/: add missing #include <linux/vmalloc.h>'a
From: Denis Vlasenko @ 2005-11-12 12:02 UTC (permalink / raw)
To: Adrian Bunk; +Cc: jgarzik, netdev, linux-kernel
In-Reply-To: <20051111200735.GO5376@stusta.de>
On Friday 11 November 2005 22:07, Adrian Bunk wrote:
> This is required for always getting the vmalloc()/vfree() prototypes.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Applied, thanks.
--
vda
^ permalink raw reply
* Re: [RFC: 2.6 patch] remove ISA legacy functions
From: Al Viro @ 2005-11-12 13:48 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Jeff Garzik, Adrian Bunk, Andrew Morton, linux-kernel, linux-scsi,
netdev, jonathan, tlinux-users, Jaroslav Kysela
In-Reply-To: <20051112052918.GG1658@parisc-linux.org>
On Fri, Nov 11, 2005 at 10:29:18PM -0700, Matthew Wilcox wrote:
> I think they work fine everywhere. Adrian wants to remove the API they
> use.
>
> I think this is a bad idea. The drivers should be converted.
They are - I'll send patches later today...
^ permalink raw reply
* Get rid of everything you are indebted for without paying an other cent
From: domitila ramos @ 2005-11-12 15:57 UTC (permalink / raw)
To: Windy Murray
Eliminate all you owe with out paying another dollar. End the embarrassing
phone calls. Bring a stop to the mailing of checks! As it turns out nearly
all lending orgizations not following the laws here in the US. Unbelievable
but true!
Go to our web site for detailed information about our technique at N O
expense or commitment. You have naught to loose and ample to obtain.
http://it.geocities.com/melitta_sutorius/?w=1n.Eradicate all that you are
indebted for without sending an other dollar
Detailed information or to stop receiving or to observe postal address
Raise cash flow and your customer base within 24 hours using knowledgeable
and massive online mail marketing blitz
Join with biggest and the best markupholders@gawab.com
When they saw Rob at liberty, and their comrade lying apparently dead, the
chief cried out in surprise, using some expressive words in his own
language. If it's just the same to you, old chap, said Rob, coolly, I won't
be eaten to-day
You can make a pie of that fellow on the ground
^ permalink raw reply
* [PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message
From: James Ketrenos @ 2005-11-12 18:50 UTC (permalink / raw)
To: NetDev, linux-kernel; +Cc: Benoit Boissinot, Jeff Garzik
ipw2100: Fix 'Driver using old /proc/net/wireless...' message
Wireless extensions moved the get_wireless_stats handler from being
in net_device into wireless_handler.
A prior instance of this patch resolved the issue for the ipw2200. This
one fixes it for the ipw2100.
Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
---
Also available as overlay at rsync://bughost.org/repos/ipw-delta/.git/
---
drivers/net/wireless/ipw2100.c | 29 ++++++++++++++++++-----------
drivers/net/wireless/ipw2100.h | 2 ++
2 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index a2e6214..77d2a21 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6344,7 +6344,8 @@ static struct net_device *ipw2100_alloc_
dev->ethtool_ops = &ipw2100_ethtool_ops;
dev->tx_timeout = ipw2100_tx_timeout;
dev->wireless_handlers = &ipw2100_wx_handler_def;
- dev->get_wireless_stats = ipw2100_wx_wireless_stats;
+ priv->wireless_data.ieee80211 = priv->ieee;
+ dev->wireless_data = &priv->wireless_data;
dev->set_mac_address = ipw2100_set_address;
dev->watchdog_timeo = 3 * HZ;
dev->irq = 0;
@@ -7178,6 +7179,11 @@ static int ipw2100_wx_get_range(struct n
}
range->num_frequency = val;
+ /* Event capability (kernel + driver) */
+ range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
+ IW_EVENT_CAPA_MASK(SIOCGIWAP));
+ range->event_capa[1] = IW_EVENT_CAPA_K_1;
+
IPW_DEBUG_WX("GET Range\n");
return 0;
@@ -8446,16 +8452,6 @@ static iw_handler ipw2100_private_handle
#endif /* CONFIG_IPW2100_MONITOR */
};
-static struct iw_handler_def ipw2100_wx_handler_def = {
- .standard = ipw2100_wx_handlers,
- .num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
- .num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
- .num_private_args = sizeof(ipw2100_private_args) /
- sizeof(struct iw_priv_args),
- .private = (iw_handler *) ipw2100_private_handler,
- .private_args = (struct iw_priv_args *)ipw2100_private_args,
-};
-
/*
* Get wireless statistics.
* Called by /proc/net/wireless
@@ -8597,6 +8593,17 @@ static struct iw_statistics *ipw2100_wx_
return (struct iw_statistics *)NULL;
}
+static struct iw_handler_def ipw2100_wx_handler_def = {
+ .standard = ipw2100_wx_handlers,
+ .num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
+ .num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
+ .num_private_args = sizeof(ipw2100_private_args) /
+ sizeof(struct iw_priv_args),
+ .private = (iw_handler *) ipw2100_private_handler,
+ .private_args = (struct iw_priv_args *)ipw2100_private_args,
+ .get_wireless_stats = ipw2100_wx_wireless_stats,
+};
+
static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
{
union iwreq_data wrqu;
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index a1a9cbc..7f20cf3 100644
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -572,6 +572,8 @@ struct ipw2100_priv {
struct net_device *net_dev;
struct iw_statistics wstats;
+ struct iw_public_data wireless_data;
+
struct tasklet_struct irq_tasklet;
struct workqueue_struct *workqueue;
^ permalink raw reply related
* Re: [PATCH] [NETFILTER]: Allow SYN+PSH as valid flag combination
From: David S. Miller @ 2005-11-12 20:14 UTC (permalink / raw)
To: laforge; +Cc: netdev, netfilter-devel, vlad, kaber
In-Reply-To: <20051112103918.GG10584@sunbeam.de.gnumonks.org>
From: Harald Welte <laforge@netfilter.org>
Date: Sat, 12 Nov 2005 11:39:18 +0100
> [NETFILTER] {ip,nf}_conntrack TCP: Accept SYN+PUSH like SYN
>
> Some devices (e.g. Qlogic iSCSI HBA hardware like QLA4010 up to firmware
> 3.0.0.4) initiates TCP with SYN and PUSH flags set.
>
> The Linux TCP/IP stack deals fine with that, but the connection tracking
> code doesn't.
>
> This patch alters TCP connection tracking to accept SYN+PUSH as a valid
> flag combination.
>
> Signed-off-by: Vlad Drukker <vlad@storewiz.com>
> Signed-off-by: Harald Welte <laforge@netfilter.org>
Applied.
I think this one is a -stable candidate (sans the nf_conntrack
bits of course :-). But that's up to you.
^ permalink raw reply
* [PATCH]small fix for __ipv6_addr_type(...)
From: Yan Zheng @ 2005-11-13 8:01 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, yoshfuji
Hi.
I think the scope for loopback address should be node local.
Regards
Signed-off-by: Yan Zheng <yanzheng@21cn.com>
========================================================================
--- linux-2.6.15-rc1/net/ipv6/addrconf.c 2005-11-13 12:23:06.000000000 +0800
+++ linux/net/ipv6/addrconf.c 2005-11-13 15:50:03.000000000 +0800
@@ -249,7 +249,7 @@ int __ipv6_addr_type(const struct in6_ad
if (addr->s6_addr32[3] == htonl(0x00000001))
return (IPV6_ADDR_LOOPBACK | IPV6_ADDR_UNICAST |
- IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL)); /* addr-select 3.4 */
+ IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_NODELOCAL)); /* addr-select 3.4 */
return (IPV6_ADDR_COMPATv4 | IPV6_ADDR_UNICAST |
IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL)); /* addr-select 3.3 */
^ permalink raw reply
* [2.6 patch] rename hostap.c to hostap_main.c
From: Adrian Bunk @ 2005-11-13 16:27 UTC (permalink / raw)
To: hostap, linux-kernel, jgarzik, netdev; +Cc: sam
In-Reply-To: <20051106041543.GC8972@jm.kir.nu>
On Sat, Nov 05, 2005 at 08:15:43PM -0800, Jouni Malinen wrote:
> On Sun, Nov 06, 2005 at 01:53:43AM +0100, Adrian Bunk wrote:
> > I wanted to remove the #include "hostap_ioctl.c" from hostap.c and build
> > hostap_ioctl.c separately, but this doesn't work since hostap.c has the
> > same name as the module.
>
> Is this patch changing anything in hostap.c or is it just a rename of
> the file? Patch file is not exactly ideal for this kind of changes and I
> hope git has a better way of storing this kind of rename.
There's no other change.
If you agree, Jeff might be able to do the
mv drivers/net/wireless/hostap/hostap.c \
drivers/net/wireless/hostap/hostap_main.c
plus applying the patch below.
> I would rather not rename the file, but if this is the only way of
> getting the module built in pieces, I'm okay with the change (assuming
> nothing else changed in hostap.c in this changeset).
>...
AFAIK you can't build a module hostap.o consisting of multiple objects
with the source files of one of them named hostap.c (Sam Cc'ed for this).
> Jouni Malinen PGP id EFC895FA
cu
Adrian
<-- snip -->
I wanted to remove the #include "hostap_ioctl.c" from hostap.c and build
hostap_ioctl.c separately, but this doesn't work since hostap.c has the
same name as the module.
After renaming hostap.c this will be possible.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.14-mm2-full/drivers/net/wireless/hostap/Makefile.old 2005-11-13 17:10:33.000000000 +0100
+++ linux-2.6.14-mm2-full/drivers/net/wireless/hostap/Makefile 2005-11-13 17:11:11.000000000 +0100
@@ -1,3 +1,4 @@
+hostap-y := hostap_main.o
obj-$(CONFIG_HOSTAP) += hostap.o
obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o
^ permalink raw reply
* Re: [2.6 patch] rename hostap.c to hostap_main.c
From: Jouni Malinen @ 2005-11-13 16:46 UTC (permalink / raw)
To: Adrian Bunk; +Cc: hostap, linux-kernel, jgarzik, netdev, sam
In-Reply-To: <20051113162745.GM21448@stusta.de>
On Sun, Nov 13, 2005 at 05:27:45PM +0100, Adrian Bunk wrote:
> There's no other change.
>
> If you agree, Jeff might be able to do the
>
> mv drivers/net/wireless/hostap/hostap.c \
> drivers/net/wireless/hostap/hostap_main.c
>
> plus applying the patch below.
OK, I'm okay with that change.
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply
* Re: [2.6 patch] rename hostap.c to hostap_main.c
From: Sam Ravnborg @ 2005-11-13 17:34 UTC (permalink / raw)
To: Adrian Bunk; +Cc: hostap, linux-kernel, jgarzik, netdev
In-Reply-To: <20051113162745.GM21448@stusta.de>
>
> AFAIK you can't build a module hostap.o consisting of multiple objects
> with the source files of one of them named hostap.c (Sam Cc'ed for this).
Correct.
Sam
^ permalink raw reply
* Re: [PATCH 6/15] misc: Trim non-IPX builds
From: Adrian Bunk @ 2005-11-14 1:57 UTC (permalink / raw)
To: Matt Mackall, acme; +Cc: Andrew Morton, linux-kernel, netdev
In-Reply-To: <7.282480653@selenic.com>
On Fri, Nov 11, 2005 at 02:35:51AM -0600, Matt Mackall wrote:
> trivial: drop unused 802.3 code if we compile without IPX
>
> (originally from http://wohnheim.fh-wedel.de/~joern/software/kernel/je/25/)
>
> Signed-off-by: Matt Mackall <mpm@selenic.com>
>
> Index: tiny/net/802/Makefile
> ===================================================================
> --- tiny.orig/net/802/Makefile 2005-03-15 00:24:59.000000000 -0600
> +++ tiny/net/802/Makefile 2005-03-15 00:25:48.000000000 -0600
> @@ -2,8 +2,6 @@
> # Makefile for the Linux 802.x protocol layers.
> #
>
> -obj-y := p8023.o
> -
> # Check the p8022 selections against net/core/Makefile.
> obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
> obj-$(CONFIG_LLC) += p8022.o psnap.o
> @@ -11,5 +9,5 @@ obj-$(CONFIG_TR) += p8022.o psnap.o tr.o
> obj-$(CONFIG_NET_FC) += fc.o
> obj-$(CONFIG_FDDI) += fddi.o
> obj-$(CONFIG_HIPPI) += hippi.o
> -obj-$(CONFIG_IPX) += p8022.o psnap.o
> +obj-$(CONFIG_IPX) += p8022.o psnap.o p8023.o
> obj-$(CONFIG_ATALK) += p8022.o psnap.o
This patch isn't bad, but looking closer we could move the contents of
p8023.c as well as the contents of at least p8022.c and pe2.c into
af_ipx.c.
Is the contents of any of these three files expected to be used
outside IPX (closest candidate would be appletalk)?
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply
* [PATCH]IPv6: small fix for ipv6_dev_get_saddr(...)
From: Yan Zheng @ 2005-11-14 10:42 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, yoshfuji
The "score.rule++" doesn't make any sense for me.
According to codes above, I think it should be "hiscore.rule++;" .
Signed-off-by: Yan Zheng<yanzheng@21cn.com>
Index: net/ipv6/addrconf.c
============================================================
--- a/net/ipv6/addrconf.c 2005-11-13 12:23:06.000000000 +0800
+++ b/net/ipv6/addrconf.c 2005-11-14 18:29:27.000000000 +0800
@@ -1045,9 +1045,10 @@ int ipv6_dev_get_saddr(struct net_device
}
#endif
/* Rule 8: Use longest matching prefix */
- if (hiscore.rule < 8)
+ if (hiscore.rule < 8) {
hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);
- score.rule++;
+ hiscore.rule++;
+ }
score.matchlen = ipv6_addr_diff(&ifa->addr, daddr);
if (score.matchlen > hiscore.matchlen) {
score.rule = 8;
^ permalink raw reply
* [PATCH] - Fixes sparse warning in ipv6/ipv6_sockglue.c
From: Luiz Fernando Capitulino @ 2005-11-14 11:54 UTC (permalink / raw)
To: akpm; +Cc: lkml, netdev
Hi,
The patch below fixes the following sparse warning:
net/ipv6/ipv6_sockglue.c:291:13: warning: Using plain integer as NULL pointer
Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
net/ipv6/ipv6_sockglue.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -287,7 +287,7 @@ int ipv6_setsockopt(struct sock *sk, int
{
struct ipv6_txoptions *opt;
if (optlen == 0)
- optval = 0;
+ optval = NULL;
/* hop-by-hop / destination options are privileged option */
retv = -EPERM;
--
Luiz Fernando N. Capitulino
^ permalink raw reply
* Re: Re: [PATCH] ebtables: Port ebt_[u]log.c to nf[netlink]_log
From: Ingo Oeser @ 2005-11-14 12:09 UTC (permalink / raw)
To: Harald Welte
Cc: Bart De Schuymer, Linux Netdev List,
ebtables-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <20051112094936.GA27644-XKR8MNpNCaUy1wpV0ib6OjPN8QKu1tr+@public.gmane.org>
Hi Harald,
would you mind merging the prink()s ...
Harald Welte wrote:
> diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
> --- a/net/bridge/netfilter/ebt_log.c
> +++ b/net/bridge/netfilter/ebt_log.c
> @@ -55,17 +57,19 @@ static void print_MAC(unsigned char *p)
> }
>
> #define myNIPQUAD(a) a[0], a[1], a[2], a[3]
> -static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
> - const struct net_device *in, const struct net_device *out,
> - const void *data, unsigned int datalen)
> +static void
> +ebt_log_packet(unsigned int pf, unsigned int hooknum,
> + const struct sk_buff *skb, const struct net_device *in,
> + const struct net_device *out, const struct nf_loginfo *loginfo,
> + const char *prefix)
> {
> - struct ebt_log_info *info = (struct ebt_log_info *)data;
> char level_string[4] = "< >";
> + unsigned int bitmask;
>
> - level_string[1] = '0' + info->loglevel;
> + level_string[1] = '0' + loginfo->u.log.level;
> spin_lock_bh(&ebt_log_lock);
> printk(level_string);
> - printk("%s IN=%s OUT=%s ", info->prefix, in ? in->name : "",
> + printk("%s IN=%s OUT=%s ", prefix, in ? in->name : "",
> out ? out->name : "");
>
> printk("MAC source = ");
... here ...
> @@ -75,7 +79,12 @@ static void ebt_log(const struct sk_buff
>
> printk("proto = 0x%04x", ntohs(eth_hdr(skb)->h_proto));
>
... and here?
> - if ((info->bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==
> + if (loginfo->type == NF_LOG_TYPE_LOG)
> + bitmask = loginfo->u.log.logflags;
> + else
> + bitmask = NF_LOG_MASK;
> +
> + if ((bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==
> htons(ETH_P_IP)){
> struct iphdr _iph, *ih;
>
I prefer evil printk()s over multiple ones :-)
Regards
Ingo Oeser
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
^ permalink raw reply
* [ANNOUNCE] fedora-netdev kernel repository
From: John W. Linville @ 2005-11-14 20:51 UTC (permalink / raw)
To: fedora-list, fedora-announce-list, fedora-devel-list; +Cc: netdev, linux-kernel
Fedora-netdev!
This message is to announce the availability of a new Fedora-based
kernel repository. The kernels available there are based upon
the standard Fedora kernels, with the addition of current upstream
networking patches which are more recent than the Fedora kernel's
upstream base. More information is available here:
http://people.redhat.com/linville/kernels/fedora-netdev/
The purpose of this repository is two-fold: 1) to make bleeding-edge
linux kernel networking developments available to Fedora users who
need or want access to them; and, 2) to open-up the Fedora user
base as a better testing resource for the kernel netdev community.
I hope this will prove to be a win-win situation for both camps.
If you are a Fedora user with an interest or need for the latest
developments in Linux kernel networking, then _please_ try the
kernels from this repository. Your testing and feedback is greatly
appreciated, desperately requested, and graciously accepted.
Thanks in advance!
Please feel free to contact me at this address regarding these
kernels or other Fedora-related issues (especially networking).
If your interest is coming from the netdev/upstream side of the house,
you may want to contact me as linville@tuxdriver.com instead.
Thanks,
John
P.S. For those who just want to cut to the chase, do this (as root):
cd /etc/yum.repos.d
wget http://people.redhat.com/linville/kernels/fedora-netdev/fedora-netdev.repo
yum update
--
John W. Linville
linville@redhat.com
^ permalink raw reply
* [BUG] netpoll is unable to handle skb's using packet split
From: Jeff Kirsher @ 2005-11-14 21:15 UTC (permalink / raw)
To: linux-kernel, netdev, mpm
When using packet split, netpoll times out when doing a netdump.
Server logs:
--netdump[14973]: Got too many timeouts in handshaking, ignoring
client 172.0.2.250
--netdump[14973]: Got too many timeouts waiting for SHOW_STATUS for
client 172.0.2.250, rebooting it.
When packet split is not used, netpoll dumps correctly. This was
reproduced using the initial setup:
HP DL380G3 (Server)
RHEL4 U1
7170 NIC
e1000 driver
HP DL380G4 (Client)
RHEL3 U5
7170 NIC
e1000 driver
We also tested using the latest RHEL4 U2 on the client, with the same results.
Netpoll does not appear to be able to handle skb's using packet split,
a possible resolution would be to test for packet split and to use
skb_linearize() in netpoll to resolve the issue.
--
Cheers,
Jeff
^ permalink raw reply
* Re: [PATCH]IPv6: small fix for ipv6_dev_get_saddr(...)
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2005-11-15 1:22 UTC (permalink / raw)
To: yanzheng, davem; +Cc: netdev, linux-kernel, yoshfuji
In-Reply-To: <43786A16.9070100@21cn.com>
In article <43786A16.9070100@21cn.com> (at Mon, 14 Nov 2005 18:42:30 +0800), Yan Zheng <yanzheng@21cn.com> says:
> The "score.rule++" doesn't make any sense for me.
> According to codes above, I think it should be "hiscore.rule++;" .
Oops, you're right.
> Signed-off-by: Yan Zheng<yanzheng@21cn.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> /* Rule 8: Use longest matching prefix */
> - if (hiscore.rule < 8)
> + if (hiscore.rule < 8) {
> hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);
> - score.rule++;
> + hiscore.rule++;
> + }
> score.matchlen = ipv6_addr_diff(&ifa->addr, daddr);
> if (score.matchlen > hiscore.matchlen) {
> score.rule = 8;
>
--
YOSHIFUJI Hideaki @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
^ permalink raw reply
* Re: [BUG] netpoll is unable to handle skb's using packet split
From: Matt Mackall @ 2005-11-15 5:23 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: linux-kernel, netdev
In-Reply-To: <9929d2390511141315t2fb15b2aucbbebcbe4cec7ef1@mail.gmail.com>
On Mon, Nov 14, 2005 at 01:15:38PM -0800, Jeff Kirsher wrote:
> When using packet split, netpoll times out when doing a netdump.
What is "packet split" in this context? You ought to cc: the netdump
people as well, as it's not part of the mainline kernel.
--
Mathematics is the supreme nostalgia of our time.
^ permalink raw reply
* Re: [BUG] netpoll is unable to handle skb's using packet split
From: David S. Miller @ 2005-11-15 5:39 UTC (permalink / raw)
To: mpm; +Cc: jeffrey.t.kirsher, linux-kernel, netdev
In-Reply-To: <20051115052358.GG31287@waste.org>
From: Matt Mackall <mpm@selenic.com>
Date: Mon, 14 Nov 2005 21:23:58 -0800
> What is "packet split" in this context?
It's a mode of buffering used by the e1000 driver.
^ permalink raw reply
* Re: [BUG] netpoll is unable to handle skb's using packet split
From: David S. Miller @ 2005-11-15 5:41 UTC (permalink / raw)
To: mpm; +Cc: jeffrey.t.kirsher, linux-kernel, netdev
In-Reply-To: <20051114.213922.16377460.davem@davemloft.net>
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 14 Nov 2005 21:39:22 -0800 (PST)
> From: Matt Mackall <mpm@selenic.com>
> Date: Mon, 14 Nov 2005 21:23:58 -0800
>
> > What is "packet split" in this context?
>
> It's a mode of buffering used by the e1000 driver.
BTW, the issue is that in packet split mode, the e1000 driver is
feeding paged based non-linear SKBs into the stack on receive which is
completely legal but aparently netpoll or something parsing netpoll RX
packets does not handle it properly.
That's why the reporter suggested that perhaps an skb_linearize()
call could be added to fix the problem, but it is unknown whether
that call can be made in the context in which it would be needed.
^ permalink raw reply
* Re: [PATCH]IPv6: small fix for ipv6_dev_get_saddr(...)
From: David S. Miller @ 2005-11-15 5:42 UTC (permalink / raw)
To: yoshfuji; +Cc: yanzheng, netdev, linux-kernel
In-Reply-To: <20051115.102237.101993116.yoshfuji@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Tue, 15 Nov 2005 10:22:37 +0900 (JST)
> In article <43786A16.9070100@21cn.com> (at Mon, 14 Nov 2005 18:42:30 +0800), Yan Zheng <yanzheng@21cn.com> says:
>
> > The "score.rule++" doesn't make any sense for me.
> > According to codes above, I think it should be "hiscore.rule++;" .
>
> Oops, you're right.
>
> > Signed-off-by: Yan Zheng<yanzheng@21cn.com>
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Applied.
^ permalink raw reply
* Re: [PATCH] - Fixes sparse warning in ipv6/ipv6_sockglue.c
From: David S. Miller @ 2005-11-15 5:43 UTC (permalink / raw)
To: lcapitulino; +Cc: akpm, linux-kernel, netdev
In-Reply-To: <20051114095422.5cc4727f.lcapitulino@mandriva.com.br>
From: Luiz Fernando Capitulino <lcapitulino@mandriva.com.br>
Date: Mon, 14 Nov 2005 09:54:22 -0200
> The patch below fixes the following sparse warning:
>
> net/ipv6/ipv6_sockglue.c:291:13: warning: Using plain integer as NULL pointer
>
> Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Applied, thanks.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox