* Re: [PATCH][MCAST]Clear MAF_GSQUERY flag when process MLDv1 general query messages.
From: Yan Zheng @ 2005-11-08 0:33 UTC (permalink / raw)
Cc: linux-kernel, netdev
In-Reply-To: <OF7136C7EC.A2BD07E5-ON882570B2.00768CF6-882570B2.0077AB0D@us.ibm.com>
> Do you have a test case that demonstrates this? It appears to
> me that an MLDv2 general query doesn't execute that code (short circuited
> above) and an MLDv1 general query (what that code is handling) will
> have a timer expiring before switching back to MLDv2 mode (so it'll send
> a v1 report, without any sources). Unless I'm missing something, I can't
> see any way for the scenario you've described to happen.
> That said, I also can't see anything it would hurt, so I don't
> object,
> but it looks unnecessary to me.
>
> +-DLS
>
>
>MLDv2 general query doesn't execute that code
Yes, MLDv2 general query also leave that bit unchanged. In MLDv1
compatibility mode, igmp6_timer_handler(...) uses igmp6_send(...) to
send report, it leaves that bit unchanged too. So when switching back
to MLDv2 mode, MAF_GSQUERY flag set long time ago may have effect on
the report .
>That said, I also can't see anything it would hurt
I agree with you. it hurts nothing but a report.
By the way. May I ask a question.
Do you agree my change on is_in(...)? That is check include/exclude
count when type is MLD2_MODE_IS_INCLUDE or MLD2_MODE_IS_EXCLUDE.
(especially for MLD2_MODE_IS_EXCLUDE)
Regards
^ permalink raw reply
* [2.4 patch] airo.c/airo_cs.c: correct prototypes
From: Adrian Bunk @ 2005-11-08 2:02 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: jgarzik, netdev, linux-kernel, Benjamin Reed
This patch creates a file airo.h containing prototypes of the global
functions in airo.c used by airo_cs.c .
If you got strange problems with either airo_cs devices or in any other
completely unrelated part of the kernel shortly or long after a airo_cs
device was detected by the kernel, this might have been caused by the
fact that caller and callee disagreed regarding the size of the first
argument to init_airo_card()...
A similar patch was already included in Linus' 2.6 tree.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/net/wireless/airo.c | 2 ++
drivers/net/wireless/airo.h | 8 ++++++++
drivers/net/wireless/airo_cs.c | 6 ++----
3 files changed, 12 insertions(+), 4 deletions(-)
--- /dev/null 2005-04-28 03:52:17.000000000 +0200
+++ linux-2.4.32-rc2-full/drivers/net/wireless/airo.h 2005-11-08 02:58:54.000000000 +0100
@@ -0,0 +1,8 @@
+#ifndef _AIRO_H_
+#define _AIRO_H_
+
+struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia);
+void stop_airo_card(struct net_device *dev, int freeres);
+int reset_airo_card(struct net_device *dev);
+
+#endif /* _AIRO_H_ */
--- linux-2.4.32-rc2-full/drivers/net/wireless/airo.c.old 2005-11-08 02:54:44.000000000 +0100
+++ linux-2.4.32-rc2-full/drivers/net/wireless/airo.c 2005-11-08 02:55:04.000000000 +0100
@@ -43,6 +43,8 @@
#include <linux/pci.h>
#include <asm/uaccess.h>
+#include "airo.h"
+
#ifdef CONFIG_PCI
static struct pci_device_id card_ids[] = {
{ 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
--- linux-2.4.32-rc2-full/drivers/net/wireless/airo_cs.c.old 2005-11-08 02:55:54.000000000 +0100
+++ linux-2.4.32-rc2-full/drivers/net/wireless/airo_cs.c 2005-11-08 02:56:20.000000000 +0100
@@ -45,6 +45,8 @@
#include <pcmcia/cisreg.h>
#include <pcmcia/ds.h>
+#include "airo.h"
+
/*
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
you do not define PCMCIA_DEBUG at all, all the debug code will be
@@ -91,10 +93,6 @@
event handler.
*/
-struct net_device *init_airo_card( int, int, int );
-void stop_airo_card( struct net_device *, int );
-int reset_airo_card( struct net_device * );
-
static void airo_config(dev_link_t *link);
static void airo_release(u_long arg);
static int airo_event(event_t event, int priority,
^ permalink raw reply
* Re: [PATCH] Re: IPW Question on menuconfig
From: John W. Linville @ 2005-11-08 2:04 UTC (permalink / raw)
To: Jan Niehusmann
Cc: Alejandro Bonilla Beeche, netdev, linux-kernel, James Ketrenos
In-Reply-To: <20051023223658.GA5367@knautsch.gondor.com>
Do we want this patch? If yes, Jan could you reformat your posting
according to the rules described here:
http://linux.yyz.us/patch-format.html
Please pay particular attention to formatting your subject and
changelog information.
Thanks,
John
On Mon, Oct 24, 2005 at 12:36:58AM +0200, Jan Niehusmann wrote:
> On Mon, Oct 10, 2005 at 09:00:50PM -0600, Alejandro Bonilla Beeche wrote:
> > Network devices / Wireless, and the IPW2100 wasn't in the list. I went,
> > then Modularized the IEEE80211 and then IPW2100 was there. I think is
> > kind of estrange that IPW2100 wouldn't show just because it has a
> > dependencie, shouldn't IPW2100 show in the list, and if you select it,
> > then it would also select CONFIG_IEEE80211?
>
> I think you are right, so the config script should be changed like shown
> below. (But I'm not really familiar with the config language, so I may
> be missing some obvious problems?)
>
> Signed-off-by: Jan Niehusmann <jan@gondor.com>
> (in case somebody cares for that for such a small change...)
>
>
> diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
> --- a/drivers/net/wireless/Kconfig
> +++ b/drivers/net/wireless/Kconfig
> @@ -139,8 +139,9 @@ comment "Wireless 802.11b ISA/PCI cards
>
> config IPW2100
> tristate "Intel PRO/Wireless 2100 Network Connection"
> - depends on NET_RADIO && PCI && IEEE80211
> + depends on NET_RADIO && PCI
> select FW_LOADER
> + select IEEE80211
> ---help---
> A driver for the Intel PRO/Wireless 2100 Network
> Connection 802.11b wireless network adapter.
> @@ -192,8 +193,9 @@ config IPW_DEBUG
>
> config IPW2200
> tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
> - depends on IEEE80211 && PCI
> + depends on PCI
> select FW_LOADER
> + select IEEE80211
> ---help---
> A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
> Connection adapters.
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply
* Future of DONGLE_OLD drivers?
From: Adrian Bunk @ 2005-11-08 3:42 UTC (permalink / raw)
To: Jean Tourrilhes, rmk; +Cc: netdev, linux-kernel
Looking at drivers/net/irda/Kconfig, it seems all DONGLE_OLD drivers
except EP7211_IR have more recent drivers.
My questions are:
Is there still any reason to keep the DONGLE_OLD drivers except
EP7211_IR?
Is the Cirrus Logic EDB-7211 evaluation board still an actively
maintained and supported platform or an obsolete platform?
TIA
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
* Re: error compiling kernel...
From: Grant Grundler @ 2005-11-08 5:59 UTC (permalink / raw)
To: netdev; +Cc: openib-general
In-Reply-To: <4370275D.9060001@cse.ohio-state.edu>
On Mon, Nov 07, 2005 at 11:19:41PM -0500, Sayantan Sur wrote:
...
> Has anyone been able to compile gen2 with 2.6.14?
Yes - but I've run into a different problem.
After fixing up include/rdma to point at drivers/infiniband/include/rdma,
I get a symbol missing from from the modules.
iota:/usr/src/linux-2.6.14# make modules_install
...
if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F System.map 2.
6.14; fi
WARNING: /lib/modules/2.6.14/kernel/drivers/infiniband/ulp/sdp/ib_sdp.ko needs u
nknown symbol ip_dev_find
WARNING: /lib/modules/2.6.14/kernel/drivers/infiniband/core/ib_at.ko needs unkno
wn symbol ip_dev_find
WARNING: /lib/modules/2.6.14/kernel/drivers/infiniband/core/ib_addr.ko needs unk
nown symbol ip_dev_find
iota:/usr/src/linux-2.6.14#
ip_dev_find() is not exported by net/ipv4/fib_frontend.c.
However, drivers/infiniband is the only module that needs this.
CONFIG_IP_MROUTE is another configurable user but cannot be enabled
as a module.
Patch below adds EXPORT_SYMBOL() to fib_frontend.c.
I'm not trying to assert this is the Right Thing.
It's just the first obvious solution to the immediate problem.
thanks,
grant
Signed-off-by: Grant Grundler <iod00d@hp.com>
--- linux-2.6.14-ORIG/net/ipv4/fib_frontend.c 2005-10-27 17:02:08.000000000 -0700
+++ linux-2.6.14/net/ipv4/fib_frontend.c 2005-11-07 21:29:22.000000000 -0800
@@ -662,3 +662,4 @@ void __init ip_fib_init(void)
EXPORT_SYMBOL(inet_addr_type);
EXPORT_SYMBOL(ip_rt_ioctl);
+EXPORT_SYMBOL(ip_dev_find);
^ permalink raw reply
* Re: error compiling kernel...
From: Grant Grundler @ 2005-11-08 6:08 UTC (permalink / raw)
To: netdev; +Cc: openib-general
In-Reply-To: <20051108055949.GC18222@esmail.cup.hp.com>
On Mon, Nov 07, 2005 at 09:59:49PM -0800, Grant Grundler wrote:
> WARNING: /lib/modules/2.6.14/kernel/drivers/infiniband/ulp/sdp/ib_sdp.ko needs unknown symbol ip_dev_find
> Patch below adds EXPORT_SYMBOL() to fib_frontend.c.
...never mind. Johann George just pointed out someone already has
added this diff to the openib.org repository:
https://openib.org/svn/gen2/trunk/src/linux-kernel/patches/linux-2.6.14-fib-frontend.diff
sorry,
grant
^ permalink raw reply
* Re: [NF+IPsec 4/6]: Make IPsec input processing symetrical to output
From: Patrick McHardy @ 2005-11-08 14:01 UTC (permalink / raw)
To: Yasuyuki KOZAKAI; +Cc: netdev, netfilter-devel, herbert
In-Reply-To: <200511051032.jA5AWl2l000619@toshiba.co.jp>
Yasuyuki KOZAKAI wrote:
> I try to comment based on discussion with Yoshifuji-san and Miyazawa-san.
>
> We think it's confusing for user to mix decrypted packets and pre-decrypted
> ones to same hook. For example, if user want to accept packets encrypted by
> transport mode ESP and drop others, he will do "iptables -A INPUT -p esp -j
> ACCEPT" and "iptables -P INPUT DROP". But decrypted packets will be dropped
> because of the 2nd command. Of cause the match module 'policy' will be helpful
> in such case, but it's simple if he can different name of hook with INPUT.
>
> And, in logical, the hook for decrypted packet and the one for pre-decrypted
> packet is different like the current LOCAL_IN and LOCAL_OUT. Their place and
> the packets they can see, are different.
I disagree. LOCAL_IN is for locally delivered packets, and both the
decrypted and the encrypted packet are delivered locally. This is
true for tunnel mode, handling transport mode the same way seem
consistent, not confusing to me. This is also the way klips has
done it for ages and users are used to this and are actually asking
for exactly this behaviour.
> This can be said about output path. The hook for encrypted packet and the one
> for pre-encrypted packet is different.
Well, this is not intended but one of the problems I want to fix.
> In the current, LOCAL_OUT see pre-encrypted packet. I've been assuming
> that LOCAL_OUT see the packets just before sending them from network device.
> This is the reason why I said "I support the way" - which means LOCAL_OUT
> doesn't see pre-encrypted packet.
Same holds here. LOCAL_OUT is for locally generated packets, and should
see both the plain text and the encrypted packet. This is entirely
consistent with other tunnels like IPIP or GRE.
> Meanwhile the hook to see pre-encrypted packet is necessary for NAT
> indeed as you pointed out. Then our suggestion is adding new hook
> with new name, and distinguishing cleary between the usage of new and
> current hook.
We can't do that because introducing new hooks to the tables breaks
userspace compatibility.
Regards
Patrick
^ permalink raw reply
* Re: [PATCH] [IPV4] Fix secondary IP addresses after promotion
From: Patrick McHardy @ 2005-11-08 14:11 UTC (permalink / raw)
To: Thomas Graf
Cc: Brian Pomerantz, netdev, davem, kuznet, pekkas, jmorris, yoshfuji,
kaber, linux-kernel
In-Reply-To: <20051107215022.GH23537@postel.suug.ch>
Thomas Graf wrote:
> * Thomas Graf <tgraf@suug.ch> 2005-11-05 14:46
>
>>Assuming this is a separate bug, I'm not sure if this is the right
>>way to fix it. I think it would be better to rewrite the preferred
>>source address of all related local routes and only perform a
>>remove-and-add on the secondary address being promoted.
>
>
> I tried it out and although it works it's not clean yet because
> changing fib_info also changes pref_src for the routes to be
> deleted which will lead to slightly incorrect notifications later
> on. I now think that explicitely deleting and re-adding them
> later on is better as well ;-)
Yes, fixing it correctly looks very hard. Just changing the routes
doesn't seem right to me, someone might have added it with exactly
this prefsrc and doesn't want it to change, its also not clear how
to notify on this. Taking care of correct ordering of the ifa_list
is also more complicated without just deleting and readding them.
I have a patch to do this, but it needs some debugging, for some
unknown reason it crashes sometimes if I remove addresses without
specifying the mask.
^ permalink raw reply
* Re: [stable] [2.6 patch] airo.c/airo_cs.c: correct prototypes
From: Greg KH @ 2005-11-08 18:13 UTC (permalink / raw)
To: Adrian Bunk; +Cc: jgarzik, netdev, Benjamin Reed, linux-kernel, stable
In-Reply-To: <20051105164227.GK5368@stusta.de>
On Sat, Nov 05, 2005 at 05:42:27PM +0100, Adrian Bunk wrote:
> This patch creates a file airo.h containing prototypes of the global
> functions in airo.c used by airo_cs.c .
>
> If you got strange problems with either airo_cs devices or in any other
> completely unrelated part of the kernel shortly or long after a airo_cs
> device was detected by the kernel, this might have been caused by the
> fact that caller and callee disagreed regarding the size of the first
> argument to init_airo_card()...
>
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
queued to -stable.
thanks,
greg k-h
^ permalink raw reply
* [ANNOUNCE] iproute2 2.6.14-051107
From: Stephen Hemminger @ 2005-11-08 18:28 UTC (permalink / raw)
To: netdev, lartc
Update to iproute2 is available. Most of the changes were to repair the
things that broke with the introduction of the batch mode to the ip command.
http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.14-051107.tar.gz
For info on CVS ans other info see:
http://linux-net.osdl.org/index.php/Iproute2
Masahide NAKAMURA
* Updating for 2.6.14
- Show UPD{SA,POLICY} message information from kernel instead of error
- Add lengh check of deleting message from kernel
- Use macro for struct xfrm_user{sa,policy}_id
* Minor fix:
- Add fflush at the end of normal dump
Jamal Hadi Salim
* Fix handling of XFRM monitor and state
* Fix ip rule flush, need to reopen rtnl
Stephen Hemminger
* Update to 2.6.14 sanitized headers
* Add more CBQ examples from Fedora Core
* Fix buffer overrun in iproute because of bits vs. bytes confusion
Patrick McHardy
* Fix ip command shortcuts
^ permalink raw reply
* Free referrals at All Services Finders for users and free sign ups for service providers in San Diego County
From: Mike Benoit @ 2005-11-08 22:36 UTC (permalink / raw)
To: netdev
The first service provider in each of our service categories who registers as a vendor at www.AllServicesFinders.com will receive a free six month ad.
If you are not a service provider please register as a user. This too is totally free and we are having a five hundred dollar drawing for those who have registered at the end of the year.
To register just go to www.AllServicesFinders.com After you make it there then click on the login button at the right hand top side of the page.
This will take you to a login screen, immediately to the right of the login field you will find instruction on upgrading to a vendor account or opening a user account. Just click on that arrow and carefully fill out the information asked to create your account.
You will not be asked for money or credit card information. Even if the page has a field for that information do not fill it in. That is for those people who are paying for ads.
Thanks
Mike
^ permalink raw reply
* [PATCH] Fix fallout from CONFIG_IPV6_PRIVACY
From: Peter Chubb @ 2005-11-09 0:16 UTC (permalink / raw)
To: netdev, linux-kernel
Trying to build today's 2.6.14+git snapshot gives undefined references
to use_tempaddr
Looks like an ifdef got left out.
Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
net/ipv6/addrconf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6-import/net/ipv6/addrconf.c
===================================================================
--- linux-2.6-import.orig/net/ipv6/addrconf.c 2005-11-09 11:11:42.137993239 +1100
+++ linux-2.6-import/net/ipv6/addrconf.c 2005-11-09 11:12:39.857561898 +1100
@@ -1022,6 +1022,7 @@ int ipv6_dev_get_saddr(struct net_device
continue;
}
+#ifdef CONFIG_IPV6_PRIVACY
/* Rule 7: Prefer public address
* Note: prefer temprary address if use_tempaddr >= 2
*/
@@ -1043,7 +1044,7 @@ int ipv6_dev_get_saddr(struct net_device
if (hiscore.attrs & IPV6_SADDR_SCORE_PRIVACY)
continue;
}
-
+#endif
/* Rule 8: Use longest matching prefix */
if (hiscore.rule < 8)
hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);
^ permalink raw reply
* TSO and 2.6.13.2
From: Ben Greear @ 2005-11-09 0:44 UTC (permalink / raw)
To: 'netdev@oss.sgi.com'
It appears that I can (almost?) completedly deadlock a
TCP connection when using TSO on 2.6.13.2. My test involves
trying to send 200Mbps between two interfaces. With TSO enabled (ie, the default
for e1000 NICs), in less than 1 minute, there are no more packets transmitted,
though it does run nice and fast untill it completely breaks :P
I disabled TSO with ethtool, and now it seems to be working reliably.
I can attempt to grab network traces if this is worth pursuing.
Considering the ongoing troubles with TSO, it is my opinion that it
should be disabled by default...but maybe I'm just unlucky.
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
* Re: [PATCH] [IPV4] Fix secondary IP addresses after promotion
From: Thomas Graf @ 2005-11-09 0:56 UTC (permalink / raw)
To: Patrick McHardy
Cc: Brian Pomerantz, netdev, davem, kuznet, pekkas, jmorris, yoshfuji,
kaber, linux-kernel
In-Reply-To: <4370B203.8070501@trash.net>
* Patrick McHardy <kaber@trash.net> 2005-11-08 15:11
> Yes, fixing it correctly looks very hard. Just changing the routes
> doesn't seem right to me, someone might have added it with exactly
> this prefsrc and doesn't want it to change, its also not clear how
> to notify on this.
Right, OTOH this someone might also just use the primary address
as prefsrc and would welcome a translation to the new address
instead of a silent deletion. Nevertheless, I agree with deleting
and readding the local routes (for now ;-) while I keep this in
mind for later improvement.
> I have a patch to do this, but it needs some debugging, for some
> unknown reason it crashes sometimes if I remove addresses without
> specifying the mask.
Interesting, do you use an iproute2 version with the wildcard
address deletion fix attached below?
diff -Nru a/ChangeLog b/ChangeLog
--- a/ChangeLog 2005-03-19 00:49:52 +01:00
+++ b/ChangeLog 2005-03-19 00:49:52 +01:00
@@ -1,3 +1,8 @@
+2005-03-19 Thomas Graf <tgraf@suug.ch>
+
+ * Warn about wildcard deletions and provide IFA_ADDRESS upon
+ deletions to enforce prefix length validation for IPv4.
+
2005-03-18 Stephen Hemminger <shemminger@osdl.org>
* add -force option to batch mode
diff -Nru a/include/utils.h b/include/utils.h
--- a/include/utils.h 2005-03-19 00:49:52 +01:00
+++ b/include/utils.h 2005-03-19 00:49:52 +01:00
@@ -43,8 +43,11 @@
__u8 family;
__u8 bytelen;
__s16 bitlen;
+ __u32 flags;
__u32 data[4];
} inet_prefix;
+
+#define PREFIXLEN_SPECIFIED 1
#define DN_MAXADDL 20
#ifndef AF_DECnet
diff -Nru a/ip/ipaddress.c b/ip/ipaddress.c
--- a/ip/ipaddress.c 2005-03-19 00:49:52 +01:00
+++ b/ip/ipaddress.c 2005-03-19 00:49:52 +01:00
@@ -744,6 +744,7 @@
} req;
char *d = NULL;
char *l = NULL;
+ char *lcl_arg = NULL;
inet_prefix lcl;
inet_prefix peer;
int local_len = 0;
@@ -821,6 +822,7 @@
usage();
if (local_len)
duparg2("local", *argv);
+ lcl_arg = *argv;
get_prefix(&lcl, *argv, req.ifa.ifa_family);
if (req.ifa.ifa_family == AF_UNSPEC)
req.ifa.ifa_family = lcl.family;
@@ -838,9 +840,17 @@
exit(1);
}
- if (peer_len == 0 && local_len && cmd != RTM_DELADDR) {
- peer = lcl;
- addattr_l(&req.n, sizeof(req), IFA_ADDRESS, &lcl.data, lcl.bytelen);
+ if (peer_len == 0 && local_len) {
+ if (cmd == RTM_DELADDR && lcl.family == AF_INET && !(lcl.flags & PREFIXLEN_SPECIFIED)) {
+ fprintf(stderr,
+ "Warning: Executing wildcard deletion to stay compatible with old scripts.\n" \
+ " Explicitly specify the prefix length (%s/%d) to avoid this warning.\n" \
+ " This special behaviour is likely to disappear in further releases,\n" \
+ " fix your scripts!\n", lcl_arg, local_len*8);
+ } else {
+ peer = lcl;
+ addattr_l(&req.n, sizeof(req), IFA_ADDRESS, &lcl.data, lcl.bytelen);
+ }
}
if (req.ifa.ifa_prefixlen == 0)
req.ifa.ifa_prefixlen = lcl.bitlen;
diff -Nru a/lib/utils.c b/lib/utils.c
--- a/lib/utils.c 2005-03-19 00:49:52 +01:00
+++ b/lib/utils.c 2005-03-19 00:49:52 +01:00
@@ -241,6 +241,7 @@
err = -1;
goto done;
}
+ dst->flags |= PREFIXLEN_SPECIFIED;
dst->bitlen = plen;
}
}
^ permalink raw reply
* [git patches] 2.6.x net driver updates
From: Jeff Garzik @ 2005-11-09 6:53 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds; +Cc: netdev, linux-kernel
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates, including a big ipw wireless update:
include/linux/eeprom.h | 136
Documentation/networking/README.ipw2100 | 119
Documentation/networking/README.ipw2200 | 194
MAINTAINERS | 18
arch/um/drivers/net_kern.c | 36
arch/xtensa/platform-iss/network.c | 33
drivers/net/Kconfig | 2
drivers/net/b44.c | 177
drivers/net/b44.h | 75
drivers/net/bonding/bond_main.c | 32
drivers/net/bonding/bonding.h | 7
drivers/net/cris/eth_v10.c | 149
drivers/net/dgrs.c | 16
drivers/net/e100.c | 6
drivers/net/ns83820.c | 13
drivers/net/s2io.c | 43
drivers/net/skge.c | 267 -
drivers/net/skge.h | 2
drivers/net/wireless/airo.c | 36
drivers/net/wireless/airo_cs.c | 6
drivers/net/wireless/atmel.c | 2
drivers/net/wireless/atmel_cs.c | 6
drivers/net/wireless/ipw2100.c | 2862 ++++++------
drivers/net/wireless/ipw2100.h | 171
drivers/net/wireless/ipw2200.c | 6861 +++++++++++++++++++++++-------
drivers/net/wireless/ipw2200.h | 592 +-
drivers/net/wireless/prism54/isl_38xx.c | 12
drivers/net/wireless/prism54/islpci_eth.c | 10
drivers/net/wireless/wavelan_cs.c | 3
drivers/net/wireless/wl3501_cs.c | 3
include/net/ieee80211.h | 2
include/net/ieee80211_crypt.h | 1
net/ieee80211/ieee80211_crypt.c | 156
net/ieee80211/ieee80211_rx.c | 2
net/ieee80211/ieee80211_wx.c | 14
35 files changed, 8273 insertions(+), 3791 deletions(-)
Adrian Bunk:
fix NET_RADIO=n, IEEE80211=y compile
kill include/linux/eeprom.h
drivers/net/s2io.c: make functions static
Alexey Dobriyan:
atmel: memset correct range
Ashutosh Naik:
dgrs: fix warnings when CONFIG_ISA and CONFIG_PCI are not enabled
Ben Cahill:
Fixes missed beacon logic in relation to on-network AP roaming.
Benoit Boissinot:
Fix 'Driver using old /proc/net/wireless support, please fix driver !' message.
Christoph Hellwig:
ieee80211: cleanup crypto list handling, other minor cleanups.
cris v10 eth: use ethtool_ops
xtensa platform-iss network: remove no-op ioctl handler
uml_net: use ethtool_ops
Francois Romieu:
b44: b44_start_xmit returns with a lock held when it fails allocating
b44: miscellaneous cleanup
b44: expose counters through ethtool
b44: s/spin_lock_irqsave/spin_lock/ in b44_interrupt
b44: late request_irq in b44_open
b44: replace B44_FLAG_INIT_COMPLETE with netif_running()
b44: race on device closing
b44: increase version number
Hong Liu:
Fixes the ad-hoc network WEP key list issue.
[Bug 455] Fix frequent channel change generates firmware fatal error.
Don't set hardware WEP if we are actually using TKIP/AES.
Mixed PTK/GTK CCMP/TKIP support.
Card with WEP enabled and using shared-key auth will have firmware
Fixes problem with WEP not working (association succeeds, but no Tx/Rx)
Fixes WEP firmware error condition.
Fixed problem with not being able to send broadcast packets.
James Ketrenos:
scripts/Lindent on ieee80211 subsystem.
Update version ieee80211 stamp to 1.1.7
Ran scripts/Lindent on drivers/net/wireless/ipw2{1,2}00.{c,h}
Catch ipw2200 up to equivelancy with v1.0.1
Catch ipw2200 up to equivelancy with v1.0.2
Catch ipw2200 up to equivelancy with v1.0.3
Catch ipw2200 up to equivelancy with v1.0.4
Catch ipw2100 up to equivelancy with v1.1.1
Catch ipw2200 up to equivelancy with v1.0.5
Changed default # of missed beacons to miss before disassociation to 24
Updated to support ieee80211 callback to is_queue_full for 802.11e
Fixed some compiler issues if CONFIG_IPW2200_QOS is enabled.
Added more useful geography encoding so people's experience with
Modified ipw_config and STATUS_INIT setting to correct race condition
Switched firmware error dumping so that it will capture a log available
Changed all of the ipw_send_cmd() calls to return any ipw_send_cmd error
Added cmdlog in non-debug systems.
Updated ipw2200 to use the new ieee80211 callbacks
Added wait_state wakeup on scan completion.
Fixed problem with get_cmd_string not existing if CONFIG_IPW_DEBUG disabled.
Removed PF_SYNCTHREAD legacy.
Updated driver version stamps for ipw2100 (1.1.3) and ipw2200 (1.0.7)
Pulled out a stray KERNEL_VERSION check around the suspend handler.
Removed legacy WIRELESS_EXT checks from ipw2200.c
Removed warning about TKIP not being configured if countermeasures are
Added channel support for ipw2200 cards identified as 'ZZR'
Fixed parameter reordering in firmware log routine.
Updated firmware version stamp to 2.4 from 2.3 so it will use the latest firmware.
Update version ipw2200 stamp to 1.0.8
Updated READMEs and MAINTAINERS for the ipw2100 and ipw2200 drivers.
Jay Vosburgh:
bonding: fix feature consolidation
Jeff Garzik:
Merge branch 'master'
Merge git://git.tuxdriver.com/git/netdev-jwl
Merge rsync://bughost.org/repos/ieee80211-delta/
Merge rsync://bughost.org/repos/ipw-delta/
[wireless ipw2100] kill unused-var warnings for debug-disabled code
jketreno@io.(none):
Fixed WEP on ipw2100 (priv->sec was being used instead of
Liu Hong:
[Bug 339] Fix ipw2100 iwconfig set/get txpower.
[Bug 637] Set tx power for A band.
Migrated some of the channel verification code back into the driver to
Luiz Fernando Capitulino:
Fix sparse warning in e100 driver.
Mike Kershaw:
Adds radiotap support to ipw2200 in monitor mode..
Panagiotis Issaris:
wireless net: Conversions of kmalloc/memset to kzalloc
Peter Jones:
Make all the places the firmware fails to load showerrors (in decimal,
Fixed is_network_packet() to include checking for broadcast packets.
Ralf Baechle:
IOC: And don't mark the things as broken Cowboy.
Roger While:
prism54 : Unused variable / extraneous udelay
prism54 : Transmit stats updated in wrong place
Stephen Hemminger:
skge: clear PCI PHY COMA mode on boot
skge: use kzalloc
skge: add mii ioctl support
skge: goto low power mode on shutdown
skge: use prefetch on receive
skge: spelling fixes
skge: increase version number
Volker Braun:
Fix problem with WEP unicast key > index 0
Zhu Yi:
IPW_DEBUG has already included DRV_NAME, remove double prefix print.
Move code from ipw2100_wpa_enable to IPW2100_PARAM_DROP_UNENCRYPTED to
Fix hardware encryption (both WEP and AES) doesn't work with fragmentation.
Fix is_duplicate_packet() bug for fragmentation number setting.
[bug 667] Fix the notorious "No space for Tx" bug.
Workaround kernel BUG_ON panic caused by unexpected duplicate packets.
Disable host fragmentation in open mode since IPW2200/2915 hardware
[Bug 792] Fix WPA-PSK AES both for -Dipw and -Dwext.
[Bug 701] Fix a misuse of ieee->mode with ieee->iw_mode.
Fix ipw_wx_get_txpow shows wrong disabled value.
Fix firmware error when setting tx_power.
[Bug 760] Fix setting WEP key in monitor mode causes IV lost.
[Fix bug# 771] Too many (8) bytes recieved when using AES/hwcrypto
[patch snipped due to size]
^ permalink raw reply
* [quagga-dev 3824] Re: Patch: RFC2863 #1 (incomplete)
From: Hasso Tepper @ 2005-11-09 9:00 UTC (permalink / raw)
To: Thomas Graf; +Cc: netdev, quagga-dev, Stefan Rompf
In-Reply-To: <20051109001921.GK23537@postel.suug.ch>
Thomas Graf wrote:
> OK, my point might not be the best, still I think it is valid. The fact
> that certain routes have to be excluded from the routing calculation
> even if their link is up and running makes it obvious that the routing
> daemon can take care of DORMANT_L3DOWN itself and we don't need the
> kernel to hide them. Nothing more.
No. Routing daemon deals only with info from neighbours. While you can
say that "if link is down => neighbour is unreachable", you can't say
absolutely nothing about link if neighbour is down. Even with PtP media.
If neighbour is down, it just means that neighbour is down, but best
route to the neighbour is still via this link.
> We're talking about the auto routes in the main table, right? There
> is no reason for the addresses to be configured as a prefix, they
> can, and in my opinion should, be added as /~0 if the net is not
> guaranteed to be reachable at exactly this interface at all times.
> e.g. a user adding the address 1.1.1.1/24 on eth3 clearly says that
> 1.1.1.0/24 is always behind eth3, no matter what.
Really? How it can be behind eth3 if state of eth3 says that "no packets
to this link - it's DOWN"?
> If the route is supposed to be non-static then the address should be
> added as /32 to avoid the auto route in main table and the broadcast
> routes in the local table. Instead the routing daemon should be
> responsible of manging 1.1.1.0/24 at all times.
>
> Does this make sense?
No. This mandates usage of routing daemon even in my laptop which is
nonsense.
> Now even if this is not acceptable and you really need a way to
> favour routes added by userspace over auto/connected routes then
> we should fix this in the routing itself and not with a new
> opertional state interface state.
I'm not talking about new operational state of interface. I'm talking
about simple rule - if link is known to be unusable (!IFF_RUNNING), don't
use routes pointed to this link. Whether they are connected routes
created by kernel or static routes created by user.
Simple scenario with my personal laptop - wired ethernet
(192.168.1.10/24) and wireless (172.16.100.10/24). Two defaults, wireless
one is with higher metric. If I walk away from my table and disconnect
wired ethernet cable, I'd expect that it wouldn't use default pointed to
wired network _and_ 192.168.1.0/24 pointed to it any more. Default
pointed to the wireless is there, wireless link is known to be usable
(IFF_RUNNING) and 192.168.1.0/24 is reachable via wireless as well.
--
Hasso Tepper
Elion Enterprises Ltd.
WAN administrator
^ permalink raw reply
* [PATCH 1/2][MCAST] Fix for is_in(...)
From: Yan Zheng @ 2005-11-09 11:57 UTC (permalink / raw)
To: netdev, David Stevens; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2141 bytes --]
Hi.
Include/exclude count of source filter also need check when type is MLD2_MODE_IS_INCLUDE or MLD2_MODE_IS_EXCLUDE.
If the check is ignored, MODE_IS_EXCLUDE report may include sources that have include count greater than zero.
You can check this bug by test.c and query.c in the attachments.
test.c create two socket and make both of them join multicast address M.
The first socket set it's filter mode to INCLUDE{X} and the second set it's filter mode to EXCLUDE{Y}.
Now the interface state for multicast address M should be EXCLUDE{Y}.
let's send a Multicast Address Specific Query by query.c.
You will notice that both X and Y are included in the MODE_IS_EXCLUDE report's source address list.
I hope I provide enough information this time. :-)
Regards
Signed-off-by: Yan Zheng<yanzheng@21cn.com>
Index:net/ipv6/mcast.c
==============================================================
--- linux-2.6.14/net/ipv6/mcast.c 2005-11-09 16:00:48.000000000 +0800
+++ linux/net/ipv6/mcast.c 2005-11-09 18:44:37.000000000 +0800
@@ -1273,22 +1273,27 @@ static int is_in(struct ifmcaddr6 *pmc,
{
switch (type) {
case MLD2_MODE_IS_INCLUDE:
- case MLD2_MODE_IS_EXCLUDE:
+ case MLD2_CHANGE_TO_INCLUDE:
if (gdeleted || sdeleted)
return 0;
+ if (psf->sf_count[MCAST_INCLUDE] == 0)
+ return 0; // maybe never happen
+ if (type == MLD2_CHANGE_TO_INCLUDE)
+ return 1;
return !((pmc->mca_flags & MAF_GSQUERY) && !psf->sf_gsresp);
- case MLD2_CHANGE_TO_INCLUDE:
- if (gdeleted || sdeleted)
- return 0;
- return psf->sf_count[MCAST_INCLUDE] != 0;
+ case MLD2_MODE_IS_EXCLUDE:
case MLD2_CHANGE_TO_EXCLUDE:
if (gdeleted || sdeleted)
return 0;
if (pmc->mca_sfcount[MCAST_EXCLUDE] == 0 ||
psf->sf_count[MCAST_INCLUDE])
return 0;
- return pmc->mca_sfcount[MCAST_EXCLUDE] ==
- psf->sf_count[MCAST_EXCLUDE];
+ if (pmc->mca_sfcount[MCAST_EXCLUDE] !=
+ psf->sf_count[MCAST_EXCLUDE])
+ return 0;
+ if (type == MLD2_CHANGE_TO_EXCLUDE)
+ return 1;
+ return !((pmc->mca_flags & MAF_GSQUERY) && !psf->sf_gsresp);
case MLD2_ALLOW_NEW_SOURCES:
if (gdeleted || !psf->sf_crcount)
return 0;
[-- Attachment #2: test.c --]
[-- Type: text/x-csrc, Size: 1298 bytes --]
#include <stdio.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/types.h>
#define IFINDEX 5 //Please adjust me first.
int main(int argc, char argv[])
{
int sockfds[2];
struct ipv6_mreq req;
struct group_filter filter;
struct sockaddr_in6 *psin6;
req.ipv6mr_interface = IFINDEX;
inet_pton(PF_INET6, "FF02::2000", &req.ipv6mr_multiaddr);
sockfds[0] = socket(PF_INET6, SOCK_DGRAM, 0);
sockfds[1] = socket(PF_INET6, SOCK_DGRAM, 0);
filter.gf_interface = IFINDEX;
filter.gf_fmode = MCAST_INCLUDE;
filter.gf_numsrc = 1;
psin6 = (struct sockaddr_in6 *)&filter.gf_group;
psin6->sin6_family = AF_INET6;
inet_pton(PF_INET6, "FF02::2000", &psin6->sin6_addr);
psin6 = (struct sockaddr_in6 *)&filter.gf_slist[0];
psin6->sin6_family = AF_INET6;
inet_pton(PF_INET6, "2002:de12:1780::1", &psin6->sin6_addr);
setsockopt(sockfds[0], SOL_IPV6, IPV6_ADD_MEMBERSHIP, &req, sizeof(req));
setsockopt(sockfds[0], SOL_IPV6, MCAST_MSFILTER, &filter, sizeof(filter));
filter.gf_fmode = MCAST_EXCLUDE;
inet_pton(PF_INET6, "2002:de12:1780::2", &psin6->sin6_addr);
setsockopt(sockfds[1], SOL_IPV6, IPV6_ADD_MEMBERSHIP, &req, sizeof(req));
setsockopt(sockfds[1], SOL_IPV6, MCAST_MSFILTER, &filter, sizeof(filter));
pause();
return 0;
}
[-- Attachment #3: query.c --]
[-- Type: text/x-csrc, Size: 945 bytes --]
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/types.h>
#define IFINDEX 5 //Please adjust me first.
struct mld2_query {
uint8_t type;
uint8_t code;
uint16_t csum;
uint16_t mrc;
uint16_t resv1;
struct in6_addr mca;
uint8_t qrv:3,
suppress:1,
resv2:4;
uint8_t qqic;
uint16_t nsrcs;
struct in6_addr srcs[0];
};
int main(int argc ,char *argv[]) {
int len, sockfd;
struct mld2_query query;
struct sockaddr_in6 addr;
memset(&addr, 0x00, sizeof(addr));
addr.sin6_family = AF_INET6;
addr.sin6_scope_id = IFINDEX;
inet_pton(PF_INET6, "FF02::1", &addr.sin6_addr);
memset(&query, 0x00, sizeof(query));
query.type = 130;
inet_pton(PF_INET6, "FF02::2000", &query.mca);
sockfd = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
sendto(sockfd, &query, sizeof(query), 0,
(struct sockaddr *)&addr, sizeof(addr));
}
^ permalink raw reply
* [PATCH 2/2][MCAST] Fix for add_grec(...)
From: Yan Zheng @ 2005-11-09 11:58 UTC (permalink / raw)
To: netdev, David Stevens; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2457 bytes --]
Hi
When ifmcaddr6's mca_sources is not NULL, but none of the sources in the list can be included in report,
(For example: when filter mode is exclude and the only source in the list has include count greater than zero.)
add_grec(...) may returns without add any data to the sk_buff. So MLD2_CHANGE_TO_EXCLUDE or MLD2_MODE_IS_EXCLUDE
report may be eliminated.
You can check this bug by test1.c in attachments. You will notice that there is no MLD2_CHANGE_TO_EXCLUDE report.
Regards
Signed-off-by: Yan Zheng<yanzheng@21cn.com>
Index:net/ipv6/mcast.c
==============================================================
--- linux-2.6.14/net/ipv6/mcast.c 2005-11-09 16:00:48.000000000 +0800
+++ linux/net/ipv6/mcast.c 2005-11-09 19:47:50.000000000 +0800
@@ -1445,18 +1445,21 @@ static struct sk_buff *add_grec(struct s
struct mld2_report *pmr;
struct mld2_grec *pgr = NULL;
struct ip6_sf_list *psf, *psf_next, *psf_prev, **psf_list;
- int scount, first, isquery, truncate;
+ int scount, first, isquery, ischange, truncate;
if (pmc->mca_flags & MAF_NOREPORT)
return skb;
isquery = type == MLD2_MODE_IS_INCLUDE ||
type == MLD2_MODE_IS_EXCLUDE;
+ ischange = type == MLD2_CHANGE_TO_INCLUDE ||
+ type == MLD2_CHANGE_TO_EXCLUDE;
truncate = type == MLD2_MODE_IS_EXCLUDE ||
- type == MLD2_CHANGE_TO_EXCLUDE;
+ type == MLD2_CHANGE_TO_EXCLUDE;
psf_list = sdeleted ? &pmc->mca_tomb : &pmc->mca_sources;
+#if 0
if (!*psf_list) {
if (type == MLD2_ALLOW_NEW_SOURCES ||
type == MLD2_BLOCK_OLD_SOURCES)
@@ -1474,12 +1477,15 @@ static struct sk_buff *add_grec(struct s
}
return skb;
}
+#endif
pmr = skb ? (struct mld2_report *)skb->h.raw : NULL;
/* EX and TO_EX get a fresh packet, if needed */
- if (truncate) {
- if (pmr && pmr->ngrec &&
- AVAILABLE(skb) < grec_size(pmc, type, gdeleted, sdeleted)) {
+ if (truncate || ischange) {
+ int min_len;
+ min_len = truncate ? grec_size(pmc, type, gdeleted, sdeleted) :
+ (sizeof(struct mld2_grec) + sizeof(struct in6_addr));
+ if (pmr && pmr->ngrec && AVAILABLE(skb) < min_len) {
if (skb)
mld_sendpack(skb);
skb = mld_newpack(dev, dev->mtu);
@@ -1488,6 +1494,10 @@ static struct sk_buff *add_grec(struct s
first = 1;
scount = 0;
psf_prev = NULL;
+ if (ischange || type == MLD2_MODE_IS_EXCLUDE) {
+ skb = add_grhead(skb, pmc, type, &pgr);
+ first = 0;
+ }
for (psf=*psf_list; psf; psf=psf_next) {
struct in6_addr *psrc;
[-- Attachment #2: test1.c --]
[-- Type: text/x-csrc, Size: 1203 bytes --]
#include <stdio.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/types.h>
#define IFINDEX 5 //Please adjust me first.
int main(int argc, char argv[])
{
int sockfds[2];
struct ipv6_mreq req;
struct group_filter filter;
struct sockaddr_in6 *psin6;
req.ipv6mr_interface = IFINDEX;
inet_pton(PF_INET6, "FF02::2000", &req.ipv6mr_multiaddr);
sockfds[0] = socket(PF_INET6, SOCK_DGRAM, 0);
sockfds[1] = socket(PF_INET6, SOCK_DGRAM, 0);
filter.gf_interface = IFINDEX;
filter.gf_fmode = MCAST_INCLUDE;
filter.gf_numsrc = 1;
psin6 = (struct sockaddr_in6 *)&filter.gf_group;
psin6->sin6_family = AF_INET6;
inet_pton(PF_INET6, "FF02::2000", &psin6->sin6_addr);
psin6 = (struct sockaddr_in6 *)&filter.gf_slist[0];
psin6->sin6_family = AF_INET6;
inet_pton(PF_INET6, "2002:de12:1780::1", &psin6->sin6_addr);
setsockopt(sockfds[0], SOL_IPV6, IPV6_ADD_MEMBERSHIP, &req, sizeof(req));
setsockopt(sockfds[0], SOL_IPV6, MCAST_MSFILTER, &filter, sizeof(filter));
sleep(10); //wait state change reports
printf("change mode to exclude\n");
setsockopt(sockfds[1], SOL_IPV6, IPV6_ADD_MEMBERSHIP, &req, sizeof(req));
pause();
return 0;
}
^ permalink raw reply
* [PATCH][MCAST]Check packet size when process Multicast Address and Source Specific Query
From: Yan Zheng @ 2005-11-09 12:35 UTC (permalink / raw)
To: netdev, David Stevens; +Cc: linux-kernel, davem
The patch changes the old one to equivalent code in IGMPv3 as David Stevens's suggestion
http://lkml.org/lkml/2005/10/31/221
Regards
Signed-off-by: Yan Zheng<yanzheng@21cn.com>
Index:net/ipv6/mcast.c
==============================================================
--- linux-2.6.14/net/ipv6/mcast.c 2005-11-09 16:00:48.000000000 +0800
+++ linux/net/ipv6/mcast.c 2005-11-09 16:20:03.000000000 +0800
@@ -1149,6 +1149,14 @@ int igmp6_event_query(struct sk_buff *sk
return -EINVAL;
}
mlh2 = (struct mld2_query *) skb->h.raw;
+ if (mlh2->nsrcs != 0) {
+ if (!pskb_may_pull(skb, srcs_offset +
+ mlh2->nsrcs * sizeof(struct in6_addr))) {
+ in6_dev_put(idev);
+ return -EINVAL;
+ }
+ mlh2 = (struct mld2_query *) skb->h.raw;
+ }
max_delay = (MLDV2_MRC(ntohs(mlh2->mrc))*HZ)/1000;
if (!max_delay)
max_delay = 1;
@@ -1165,15 +1173,7 @@ int igmp6_event_query(struct sk_buff *sk
return 0;
}
/* mark sources to include, if group & source-specific */
- if (mlh2->nsrcs != 0) {
- if (!pskb_may_pull(skb, srcs_offset +
- mlh2->nsrcs * sizeof(struct in6_addr))) {
- in6_dev_put(idev);
- return -EINVAL;
- }
- mlh2 = (struct mld2_query *) skb->h.raw;
- mark = 1;
- }
+ mark = mlh2->nsrcs != 0;
} else {
in6_dev_put(idev);
return -EINVAL;
^ permalink raw reply
* [PATCH] gianfar mii needs to zero out the mii_bus structure
From: Kumar Gala @ 2005-11-09 18:13 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linuxppc-embedded
To ensure that phy_mask and any future elements of the mii_bus
structure are initialized use kzalloc() instead of kmalloc().
This fixes an issue in which phy_mask was not being initialized
and we would skip random phy addresses when scanning.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
commit 35003e02e33939b7359635f3cf7b424723ffd4b0
tree 386160e32c51e8f1e662811738e79571c7218fdb
parent d0876a2748ddc33ca9ed1ea26cf958726c50c7b9
author Kumar Gala <galak@kernel.crashing.org> Wed, 09 Nov 2005 12:11:40 -0600
committer Kumar Gala <galak@kernel.crashing.org> Wed, 09 Nov 2005 12:11:40 -0600
drivers/net/gianfar_mii.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index 5a74d3d..ee1a77a 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -134,7 +134,7 @@ int gfar_mdio_probe(struct device *dev)
if (NULL == dev)
return -EINVAL;
- new_bus = kmalloc(sizeof(struct mii_bus), GFP_KERNEL);
+ new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
if (NULL == new_bus)
return -ENOMEM;
^ permalink raw reply related
* [patch 05/11] tcp: BIC max increment too large
From: Greg KH @ 2005-11-09 18:36 UTC (permalink / raw)
To: linux-kernel, stable, Arnaldo Carvalho de Melo, David S. Miller,
netdev
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Chuck Wolber, torvalds, akpm, alan
In-Reply-To: <20051109183614.GA3670@kroah.com>
[-- Attachment #1: tcp-bic-max-increment-too-large.patch --]
[-- Type: text/plain, Size: 984 bytes --]
From: Stephen Hemminger <shemminger@osdl.org>
The max growth of BIC TCP is too large. Original code was based on
BIC 1.0 and the default there was 32. Later code (2.6.13) included
compensation for delayed acks, and should have reduced the default
value to 16; since normally TCP gets one ack for every two packets sent.
The current value of 32 makes BIC too aggressive and unfair to other
flows.
Submitted-by: Injong Rhee <rhee@eos.ncsu.edu>
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/ipv4/tcp_bic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.14.1.orig/net/ipv4/tcp_bic.c
+++ linux-2.6.14.1/net/ipv4/tcp_bic.c
@@ -27,7 +27,7 @@
*/
static int fast_convergence = 1;
-static int max_increment = 32;
+static int max_increment = 16;
static int low_window = 14;
static int beta = 819; /* = 819/1024 (BICTCP_BETA_SCALE) */
static int low_utilization_threshold = 153;
--
^ permalink raw reply
* [patch 06/11] airo.c/airo_cs.c: correct prototypes
From: Greg KH @ 2005-11-09 18:36 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Chuck Wolber, torvalds, akpm, alan, jgarzik, bunk, netdev,
Benjamin Reed
In-Reply-To: <20051109183614.GA3670@kroah.com>
[-- Attachment #1: airo.c-airo_cs.c-correct-prototypes.patch --]
[-- Type: text/plain, Size: 2139 bytes --]
From: Adrian Bunk <bunk@stusta.de>
This patch creates a file airo.h containing prototypes of the global
functions in airo.c used by airo_cs.c .
If you got strange problems with either airo_cs devices or in any other
completely unrelated part of the kernel shortly or long after a airo_cs
device was detected by the kernel, this might have been caused by the
fact that caller and callee disagreed regarding the size of the first
argument to init_airo_card()...
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/net/wireless/airo.c | 2 ++
drivers/net/wireless/airo.h | 9 +++++++++
drivers/net/wireless/airo_cs.c | 6 ++----
3 files changed, 13 insertions(+), 4 deletions(-)
--- /dev/null
+++ linux-2.6.14.1/drivers/net/wireless/airo.h
@@ -0,0 +1,9 @@
+#ifndef _AIRO_H_
+#define _AIRO_H_
+
+struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia,
+ struct device *dmdev);
+int reset_airo_card(struct net_device *dev);
+void stop_airo_card(struct net_device *dev, int freeres);
+
+#endif /* _AIRO_H_ */
--- linux-2.6.14.1.orig/drivers/net/wireless/airo.c
+++ linux-2.6.14.1/drivers/net/wireless/airo.c
@@ -46,6 +46,8 @@
#include <linux/pci.h>
#include <asm/uaccess.h>
+#include "airo.h"
+
#ifdef CONFIG_PCI
static struct pci_device_id card_ids[] = {
{ 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
--- linux-2.6.14.1.orig/drivers/net/wireless/airo_cs.c
+++ linux-2.6.14.1/drivers/net/wireless/airo_cs.c
@@ -42,6 +42,8 @@
#include <asm/io.h>
#include <asm/system.h>
+#include "airo.h"
+
/*
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
you do not define PCMCIA_DEBUG at all, all the debug code will be
@@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4
event handler.
*/
-struct net_device *init_airo_card( int, int, int, struct device * );
-void stop_airo_card( struct net_device *, int );
-int reset_airo_card( struct net_device * );
-
static void airo_config(dev_link_t *link);
static void airo_release(dev_link_t *link);
static int airo_event(event_t event, int priority,
--
^ permalink raw reply
* [patch 07/11] NET: Fix zero-size datagram reception
From: Greg KH @ 2005-11-09 18:37 UTC (permalink / raw)
To: linux-kernel, stable, Arnaldo Carvalho de Melo, netdev
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Chuck Wolber, torvalds, akpm, alan, herbert, phillips
In-Reply-To: <20051109183614.GA3670@kroah.com>
[-- Attachment #1: fix-zero-size-datagram-reception.patch --]
[-- Type: text/plain, Size: 657 bytes --]
From: Herbert Xu <herbert@gondor.apana.org.au>
The recent rewrite of skb_copy_datagram_iovec broke the reception of
zero-size datagrams. This patch fixes it.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/core/datagram.c | 4 ++++
1 file changed, 4 insertions(+)
--- linux-2.6.14.1.orig/net/core/datagram.c
+++ linux-2.6.14.1/net/core/datagram.c
@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct
{
int i, err, fraglen, end = 0;
struct sk_buff *next = skb_shinfo(skb)->frag_list;
+
+ if (!len)
+ return 0;
+
next_skb:
fraglen = skb_headlen(skb);
i = -1;
--
^ permalink raw reply
* Re: [PATCH] Fix fallout from CONFIG_IPV6_PRIVACY
From: David S. Miller @ 2005-11-09 21:05 UTC (permalink / raw)
To: peterc; +Cc: netdev, linux-kernel
In-Reply-To: <17265.16378.77270.7493@berry.gelato.unsw.EDU.AU>
From: Peter Chubb <peterc@gelato.unsw.edu.au>
Date: Wed, 9 Nov 2005 11:16:58 +1100
> Trying to build today's 2.6.14+git snapshot gives undefined references
> to use_tempaddr
>
> Looks like an ifdef got left out.
>
> Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Applied, thanks Peter.
^ permalink raw reply
* Re: [patch 2.6.14 (take #2)] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
From: John W. Linville @ 2005-11-09 21:52 UTC (permalink / raw)
To: Pantelis Antoniou, linuxppc-embedded, netdev, linux-kernel
In-Reply-To: <20051107182459.GD13797@tuxdriver.com>
On Mon, Nov 07, 2005 at 01:24:59PM -0500, John W. Linville wrote:
> Change CONFIG_FEC_8XX to depend on CONFIG_8xx instead of CONFIG_FEC.
> CONFIG_FEC depends on ColdFire CPUs, which does not apply for the
> PPC 8xx processors.
FWIW, I have this patch available on the linville-fec_8xx branch of
netdev-jwl as described below.
Thanks,
John
---
The following changes since commit 330d57fb98a916fa8e1363846540dd420e99499a:
Al Viro:
Fix sysctl unregistration oops (CVE-2005-2709)
are found in the git repository at:
git://git.tuxdriver.com/git/netdev-jwl.git linville-fec_8xx
John W. Linville:
fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
drivers/net/fec_8xx/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/fec_8xx/Kconfig b/drivers/net/fec_8xx/Kconfig
index 94e7a9a..a84c232 100644
--- a/drivers/net/fec_8xx/Kconfig
+++ b/drivers/net/fec_8xx/Kconfig
@@ -1,6 +1,6 @@
config FEC_8XX
tristate "Motorola 8xx FEC driver"
- depends on NET_ETHERNET && FEC
+ depends on NET_ETHERNET && 8xx
select MII
config FEC_8XX_GENERIC_PHY
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply related
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