From: "Luis R. Rodriguez" <mcgrof@studorgs.rutgers.edu>
To: Jeff Garzik <jgarzik@pobox.com>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, netdev@oss.sgi.com,
prism54-devel@prism54.org
Subject: [PATCH 14/14 linux-2.6.7-rc1] prism54: Fix channel stats; bump to 1.2
Date: Mon, 24 May 2004 04:34:04 -0400 [thread overview]
Message-ID: <20040524083404.GO3330@ruslug.rutgers.edu> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 324 bytes --]
2004-05-20 Aurelien Alleaume <slts@free.fr>
* islpci_eth.c : use dev_kfree_skb_irq instead of dev_kfree_skb where needed.
* isl_ioctl.c : report channel instead of frequency in scan.
* islpci_hotplug.c : bump version to 1.2
--
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
[-- Attachment #1.2: 14-fix-channel.patch --]
[-- Type: text/plain, Size: 3966 bytes --]
2004-05-20 Aurelien Alleaume <slts@free.fr>
* islpci_eth.c : use dev_kfree_skb_irq instead of dev_kfree_skb
where needed.
* isl_ioctl.c : report channel instead of frequency in scan.
* islpci_hotplug.c : bump version to 1.2
Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/isl_ioctl.c
===================================================================
RCS file: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/isl_ioctl.c 22 Apr 2004 12:20:39 -0000 1.153
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/isl_ioctl.c 20 May 2004 06:24:11 -0000 1.154
@@ -1,4 +1,4 @@
-/* $Header: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v 1.153 2004/04/22 12:20:39 ajfa Exp $
+/* $Header: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v 1.154 2004/05/20 06:24:11 ajfa Exp $
*
* Copyright (C) 2002 Intersil Americas Inc.
* (C) 2003,2004 Aurelien Alleaume <slts@free.fr>
@@ -629,8 +629,8 @@
current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, NULL);
/* Add frequency. (short) bss->channel is the frequency in MHz */
- iwe.u.freq.m = bss->channel;
- iwe.u.freq.e = 6;
+ iwe.u.freq.m = channel_of_freq(bss->channel);
+ iwe.u.freq.e = 0;
iwe.cmd = SIOCGIWFREQ;
current_ev =
iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_eth.c
===================================================================
RCS file: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_eth.c 26 Apr 2004 10:09:58 -0000 1.36
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_eth.c 20 May 2004 06:24:12 -0000 1.37
@@ -1,4 +1,4 @@
-/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.36 2004/04/26 10:09:58 msw Exp $
+/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.37 2004/05/20 06:24:12 ajfa Exp $
*
* Copyright (C) 2002 Intersil Americas Inc.
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -275,7 +275,7 @@
avs_80211_1_header),
0, GFP_ATOMIC);
if (newskb) {
- kfree_skb(*skb);
+ dev_kfree_skb_irq(*skb);
*skb = newskb;
} else
return -1;
@@ -419,7 +419,7 @@
skb->data[4], skb->data[5]);
#endif
if (unlikely(discard)) {
- dev_kfree_skb(skb);
+ dev_kfree_skb_irq(skb);
skb = NULL;
} else
netif_rx(skb);
@@ -462,7 +462,7 @@
"Error mapping DMA address\n");
/* free the skbuf structure before aborting */
- dev_kfree_skb((struct sk_buff *) skb);
+ dev_kfree_skb_irq((struct sk_buff *) skb);
skb = NULL;
break;
}
Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_hotplug.c
===================================================================
RCS file: /var/lib/cvs/prism54-ng/ksrc/islpci_hotplug.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_hotplug.c 20 Mar 2004 16:58:36 -0000 1.59
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_hotplug.c 13 May 2004 13:19:47 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_hotplug.c,v 1.59 2004/03/20 16:58:36 mcgrof Exp $
+/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_hotplug.c,v 1.60 2004/05/13 13:19:47 msw Exp $
*
* Copyright (C) 2002 Intersil Americas Inc.
* Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -30,7 +30,7 @@
#include "isl_oid.h"
#define DRV_NAME "prism54"
-#define DRV_VERSION "1.1"
+#define DRV_VERSION "1.2"
MODULE_AUTHOR("[Intersil] R.Bastings and W.Termorshuizen, The prism54.org Development Team <prism54-devel@prism54.org>");
MODULE_DESCRIPTION("The Prism54 802.11 Wireless LAN adapter");
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
reply other threads:[~2004-05-24 8:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040524083404.GO3330@ruslug.rutgers.edu \
--to=mcgrof@studorgs.rutgers.edu \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
--cc=prism54-devel@prism54.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®