* Registration Confirmation
From: info @ 2005-12-23 8:06 UTC (permalink / raw)
To: x_mail-list
[-- Attachment #1: Type: text/plain, Size: 97 bytes --]
Protected message is attached!
***** Go to: http://www.nease.net
***** Email: postman@nease.net
[-- Attachment #2: reg_pass-data.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Re: Machine hard lock
From: Martin Tessun @ 2005-12-23 7:59 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Michael Buesch, martin.tessun-xUmxicX565+Z9vWoFJJngh2eb7JE58TQ,
netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w
In-Reply-To: <39e6f6c70512221209p24ed3543u5e8d09d9a6c5b13-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
Arnaldo Carvalho de Melo wrote:
> On 12/22/05, Michael Buesch <mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org> wrote:
>> On Thursday 22 December 2005 18:49, Martin Tessun wrote:
>>> Johannes Berg wrote:
>>>> On Thu, 2005-12-22 at 17:51 +0100, Martin Tessun wrote:
>>>>
>>>>> At least you get them inserted ;) When I try to modprobe rate_control I
>>>>> get the following:
>>>> insmod 80211 first.
>>>>
>>>> johannes
>>> No, this ist not the problem.
>>> When inserting 80211 I get the same message;
>>>
>>> kernel: 80211: ieee80211_tx_packet_data is bigger than the skb->cb (48 >
>>> 40)
>>>
>>> And *this* is the real problem. The two structs don't match somehow.
>> You're on a 64bit machine.
>> Run a 32bit kernel, or wait a few weeks until this is fixed.
>
> Or temporarily increase the size of struct sk_buff::cb from [40] to
> [48] if he wants to test other features present in this kernel release
> he is trying to compile.
Great. now it works ;) I can do some more tests now...
(Sometimes it is helpful to read the docs of tcp.h ;)
Thanks for that workaround.
Regards,
Martin
^ permalink raw reply
* [RESEND patch 3/3] s390: remove redundant and useless code in qeth
From: Frank Pavlic @ 2005-12-23 6:31 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-kernel
[patch 3/3] s390: remove redundant and useless code in qeth
From: Frank Pavlic <fpavlic@de.ibm.com>
- remove redundant and useless code in qeth for
procfs operations.
- update Revision numbers
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
diffstat:
qeth_main.c | 6 -
qeth_mpc.c | 2
qeth_mpc.h | 2
qeth_proc.c | 250 ++++++------------------------------------------------------
qeth_sys.c | 4
qeth_tso.h | 4
6 files changed, 38 insertions(+), 230 deletions(-)
diff -Naupr linux-orig/drivers/s390/net/qeth_main.c linux-patched/drivers/s390/net/qeth_main.c
--- linux-orig/drivers/s390/net/qeth_main.c 2005-12-12 19:01:34.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_main.c 2005-12-12 19:13:30.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.246 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.251 $)
*
* Linux on zSeries OSA Express and HiperSockets support
*
@@ -12,7 +12,7 @@
* Frank Pavlic (fpavlic@de.ibm.com) and
* Thomas Spatzier <tspat@de.ibm.com>
*
- * $Revision: 1.242 $ $Date: 2005/05/04 20:19:18 $
+ * $Revision: 1.251 $ $Date: 2005/05/04 20:19:18 $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@
#include "qeth_eddp.h"
#include "qeth_tso.h"
-#define VERSION_QETH_C "$Revision: 1.246 $"
+#define VERSION_QETH_C "$Revision: 1.251 $"
static const char *version = "qeth S/390 OSA-Express driver";
/**
diff -Naupr linux-orig/drivers/s390/net/qeth_mpc.c linux-patched/drivers/s390/net/qeth_mpc.c
--- linux-orig/drivers/s390/net/qeth_mpc.c 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_mpc.c 2005-12-12 19:13:41.000000000 +0100
@@ -11,7 +11,7 @@
#include <asm/cio.h>
#include "qeth_mpc.h"
-const char *VERSION_QETH_MPC_C = "$Revision: 1.12 $";
+const char *VERSION_QETH_MPC_C = "$Revision: 1.13 $";
unsigned char IDX_ACTIVATE_READ[]={
0x00,0x00,0x80,0x00, 0x00,0x00,0x00,0x00,
diff -Naupr linux-orig/drivers/s390/net/qeth_mpc.h linux-patched/drivers/s390/net/qeth_mpc.h
--- linux-orig/drivers/s390/net/qeth_mpc.h 2005-12-12 19:01:34.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_mpc.h 2005-12-12 19:13:54.000000000 +0100
@@ -14,7 +14,7 @@
#include <asm/qeth.h>
-#define VERSION_QETH_MPC_H "$Revision: 1.44 $"
+#define VERSION_QETH_MPC_H "$Revision: 1.46 $"
extern const char *VERSION_QETH_MPC_C;
diff -Naupr linux-orig/drivers/s390/net/qeth_proc.c linux-patched/drivers/s390/net/qeth_proc.c
--- linux-orig/drivers/s390/net/qeth_proc.c 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_proc.c 2005-12-12 19:03:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_fs.c ($Revision: 1.13 $)
+ * linux/drivers/s390/net/qeth_fs.c ($Revision: 1.16 $)
*
* Linux on zSeries OSA Express and HiperSockets support
* This file contains code related to procfs.
@@ -21,7 +21,7 @@
#include "qeth_mpc.h"
#include "qeth_fs.h"
-const char *VERSION_QETH_PROC_C = "$Revision: 1.13 $";
+const char *VERSION_QETH_PROC_C = "$Revision: 1.16 $";
/***** /proc/qeth *****/
#define QETH_PROCFILE_NAME "qeth"
@@ -30,30 +30,26 @@ static struct proc_dir_entry *qeth_procf
static int
qeth_procfile_seq_match(struct device *dev, void *data)
{
- return 1;
+ return(dev ? 1 : 0);
}
static void *
qeth_procfile_seq_start(struct seq_file *s, loff_t *offset)
{
- struct device *dev;
- loff_t nr;
-
+ struct device *dev = NULL;
+ loff_t nr = 0;
+
down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-
- nr = *offset;
- if (nr == 0)
+ if (*offset == 0)
return SEQ_START_TOKEN;
-
- dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL,
- NULL, qeth_procfile_seq_match);
-
- /* get card at pos *offset */
- nr = *offset;
- while (nr-- > 1 && dev)
+ while (1) {
dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
NULL, qeth_procfile_seq_match);
- return (void *) dev;
+ if (++nr == *offset)
+ break;
+ put_device(dev);
+ }
+ return dev;
}
static void
@@ -66,19 +62,14 @@ static void *
qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
{
struct device *prev, *next;
-
- if (it == SEQ_START_TOKEN) {
- next = driver_find_device(&qeth_ccwgroup_driver.driver,
- NULL, NULL, qeth_procfile_seq_match);
- if (next)
- (*offset)++;
- return (void *) next;
- }
- prev = (struct device *) it;
+
+ if (it == SEQ_START_TOKEN)
+ prev = NULL;
+ else
+ prev = (struct device *) it;
next = driver_find_device(&qeth_ccwgroup_driver.driver,
prev, NULL, qeth_procfile_seq_match);
- if (next)
- (*offset)++;
+ (*offset)++;
return (void *) next;
}
@@ -87,7 +78,7 @@ qeth_get_router_str(struct qeth_card *ca
{
int routing_type = 0;
- if (ipv == 4){
+ if (ipv == 4) {
routing_type = card->options.route4.type;
} else {
#ifdef CONFIG_QETH_IPV6
@@ -154,6 +145,7 @@ qeth_procfile_seq_show(struct seq_file *
card->qdio.in_buf_pool.buf_count);
else
seq_printf(s, " +++ LAN OFFLINE +++\n");
+ put_device(device);
}
return 0;
}
@@ -184,51 +176,16 @@ static struct file_operations qeth_procf
static struct proc_dir_entry *qeth_perf_procfile;
#ifdef CONFIG_QETH_PERF_STATS
-
-static void *
-qeth_perf_procfile_seq_start(struct seq_file *s, loff_t *offset)
-{
- struct device *dev = NULL;
- int nr;
-
- down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
- /* get card at pos *offset */
- dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL, NULL,
- qeth_procfile_seq_match);
-
- /* get card at pos *offset */
- nr = *offset;
- while (nr-- > 1 && dev)
- dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
- NULL, qeth_procfile_seq_match);
- return (void *) dev;
-}
-
-static void
-qeth_perf_procfile_seq_stop(struct seq_file *s, void* it)
-{
- up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-
-static void *
-qeth_perf_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
-{
- struct device *prev, *next;
-
- prev = (struct device *) it;
- next = driver_find_device(&qeth_ccwgroup_driver.driver, prev,
- NULL, qeth_procfile_seq_match);
- if (next)
- (*offset)++;
- return (void *) next;
-}
-
static int
qeth_perf_procfile_seq_show(struct seq_file *s, void *it)
{
struct device *device;
struct qeth_card *card;
+
+ if (it == SEQ_START_TOKEN)
+ return 0;
+
device = (struct device *) it;
card = device->driver_data;
seq_printf(s, "For card with devnos %s/%s/%s (%s):\n",
@@ -295,13 +252,14 @@ qeth_perf_procfile_seq_show(struct seq_f
card->perf_stats.outbound_do_qdio_time,
card->perf_stats.outbound_do_qdio_cnt
);
+ put_device(device);
return 0;
}
static struct seq_operations qeth_perf_procfile_seq_ops = {
- .start = qeth_perf_procfile_seq_start,
- .stop = qeth_perf_procfile_seq_stop,
- .next = qeth_perf_procfile_seq_next,
+ .start = qeth_procfile_seq_start,
+ .stop = qeth_procfile_seq_stop,
+ .next = qeth_procfile_seq_next,
.show = qeth_perf_procfile_seq_show,
};
@@ -324,93 +282,6 @@ static struct file_operations qeth_perf_
#define qeth_perf_procfile_created 1
#endif /* CONFIG_QETH_PERF_STATS */
-/***** /proc/qeth_ipa_takeover *****/
-#define QETH_IPATO_PROCFILE_NAME "qeth_ipa_takeover"
-static struct proc_dir_entry *qeth_ipato_procfile;
-
-static void *
-qeth_ipato_procfile_seq_start(struct seq_file *s, loff_t *offset)
-{
- struct device *dev;
- loff_t nr;
-
- down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
- /* TODO: finish this */
- /*
- * maybe SEQ_SATRT_TOKEN can be returned for offset 0
- * output driver settings then;
- * else output setting for respective card
- */
-
- dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL, NULL,
- qeth_procfile_seq_match);
-
- /* get card at pos *offset */
- nr = *offset;
- while (nr-- > 1 && dev)
- dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
- NULL, qeth_procfile_seq_match);
- return (void *) dev;
-}
-
-static void
-qeth_ipato_procfile_seq_stop(struct seq_file *s, void* it)
-{
- up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-
-static void *
-qeth_ipato_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
-{
- struct device *prev, *next;
-
- prev = (struct device *) it;
- next = driver_find_device(&qeth_ccwgroup_driver.driver, prev,
- NULL, qeth_procfile_seq_match);
- if (next)
- (*offset)++;
- return (void *) next;
-}
-
-static int
-qeth_ipato_procfile_seq_show(struct seq_file *s, void *it)
-{
- struct device *device;
- struct qeth_card *card;
-
- /* TODO: finish this */
- /*
- * maybe SEQ_SATRT_TOKEN can be returned for offset 0
- * output driver settings then;
- * else output setting for respective card
- */
- device = (struct device *) it;
- card = device->driver_data;
-
- return 0;
-}
-
-static struct seq_operations qeth_ipato_procfile_seq_ops = {
- .start = qeth_ipato_procfile_seq_start,
- .stop = qeth_ipato_procfile_seq_stop,
- .next = qeth_ipato_procfile_seq_next,
- .show = qeth_ipato_procfile_seq_show,
-};
-
-static int
-qeth_ipato_procfile_open(struct inode *inode, struct file *file)
-{
- return seq_open(file, &qeth_ipato_procfile_seq_ops);
-}
-
-static struct file_operations qeth_ipato_procfile_fops = {
- .owner = THIS_MODULE,
- .open = qeth_ipato_procfile_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release,
-};
-
int __init
qeth_create_procfs_entries(void)
{
@@ -426,13 +297,7 @@ qeth_create_procfs_entries(void)
qeth_perf_procfile->proc_fops = &qeth_perf_procfile_fops;
#endif /* CONFIG_QETH_PERF_STATS */
- qeth_ipato_procfile = create_proc_entry(QETH_IPATO_PROCFILE_NAME,
- S_IFREG | 0444, NULL);
- if (qeth_ipato_procfile)
- qeth_ipato_procfile->proc_fops = &qeth_ipato_procfile_fops;
-
if (qeth_procfile &&
- qeth_ipato_procfile &&
qeth_perf_procfile_created)
return 0;
else
@@ -446,62 +311,5 @@ qeth_remove_procfs_entries(void)
remove_proc_entry(QETH_PROCFILE_NAME, NULL);
if (qeth_perf_procfile)
remove_proc_entry(QETH_PERF_PROCFILE_NAME, NULL);
- if (qeth_ipato_procfile)
- remove_proc_entry(QETH_IPATO_PROCFILE_NAME, NULL);
-}
-
-
-/* ONLY FOR DEVELOPMENT! -> make it as module */
-/*
-static void
-qeth_create_sysfs_entries(void)
-{
- struct device *dev;
-
- down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-
- list_for_each_entry(dev, &qeth_ccwgroup_driver.driver.devices,
- driver_list)
- qeth_create_device_attributes(dev);
-
- up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-
-static void
-qeth_remove_sysfs_entries(void)
-{
- struct device *dev;
-
- down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-
- list_for_each_entry(dev, &qeth_ccwgroup_driver.driver.devices,
- driver_list)
- qeth_remove_device_attributes(dev);
-
- up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-
-static int __init
-qeth_fs_init(void)
-{
- printk(KERN_INFO "qeth_fs_init\n");
- qeth_create_procfs_entries();
- qeth_create_sysfs_entries();
-
- return 0;
}
-static void __exit
-qeth_fs_exit(void)
-{
- printk(KERN_INFO "qeth_fs_exit\n");
- qeth_remove_procfs_entries();
- qeth_remove_sysfs_entries();
-}
-
-
-module_init(qeth_fs_init);
-module_exit(qeth_fs_exit);
-
-MODULE_LICENSE("GPL");
-*/
diff -Naupr linux-orig/drivers/s390/net/qeth_sys.c linux-patched/drivers/s390/net/qeth_sys.c
--- linux-orig/drivers/s390/net/qeth_sys.c 2005-12-12 18:15:36.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_sys.c 2005-12-12 19:14:23.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.59 $)
+ * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.60 $)
*
* Linux on zSeries OSA Express and HiperSockets support
* This file contains code related to sysfs.
@@ -20,7 +20,7 @@
#include "qeth_mpc.h"
#include "qeth_fs.h"
-const char *VERSION_QETH_SYS_C = "$Revision: 1.59 $";
+const char *VERSION_QETH_SYS_C = "$Revision: 1.60 $";
/*****************************************************************************/
/* */
diff -Naupr linux-orig/drivers/s390/net/qeth_tso.h linux-patched/drivers/s390/net/qeth_tso.h
--- linux-orig/drivers/s390/net/qeth_tso.h 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_tso.h 2005-12-12 19:14:53.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.7 $)
+ * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.8 $)
*
* Header file for qeth TCP Segmentation Offload support.
*
@@ -7,7 +7,7 @@
*
* Author(s): Frank Pavlic <fpavlic@de.ibm.com>
*
- * $Revision: 1.7 $ $Date: 2005/05/04 20:19:18 $
+ * $Revision: 1.8 $ $Date: 2005/05/04 20:19:18 $
*
*/
#ifndef __QETH_TSO_H__
^ permalink raw reply
* [RESEND patch 2/3] s390: minor qeth network driver fixes
From: Frank Pavlic @ 2005-12-23 6:31 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-kernel
[patch 2/3] s390: minor qeth network driver fixes
From: Frank Pavlic <fpavlic@de.ibm.com>
- use netif_carrier_on/off calls to tell network stack
link carrier state
- fix possible kfree on NULL
- PDU_LEN2 is at offset 0x29 otherwise OSN chpid won't initialize
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
diffstat:
qeth_eddp.c | 3 ++-
qeth_main.c | 17 +++++++----------
qeth_mpc.h | 2 +-
3 files changed, 10 insertions(+), 12 deletions(-)
diff -Naupr linux-orig/drivers/s390/net/qeth_eddp.c linux-patched/drivers/s390/net/qeth_eddp.c
--- linux-orig/drivers/s390/net/qeth_eddp.c 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_eddp.c 2005-12-12 18:56:23.000000000 +0100
@@ -62,7 +62,8 @@ qeth_eddp_free_context(struct qeth_eddp_
for (i = 0; i < ctx->num_pages; ++i)
free_page((unsigned long)ctx->pages[i]);
kfree(ctx->pages);
- kfree(ctx->elements);
+ if (ctx->elements != NULL)
+ kfree(ctx->elements);
kfree(ctx);
}
diff -Naupr linux-orig/drivers/s390/net/qeth_main.c linux-patched/drivers/s390/net/qeth_main.c
--- linux-orig/drivers/s390/net/qeth_main.c 2005-12-12 18:15:36.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_main.c 2005-12-12 18:56:23.000000000 +0100
@@ -518,7 +518,8 @@ __qeth_set_offline(struct ccwgroup_devic
QETH_DBF_TEXT(setup, 3, "setoffl");
QETH_DBF_HEX(setup, 3, &card, sizeof(void *));
-
+
+ netif_carrier_off(card->dev);
recover_flag = card->state;
if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){
PRINT_WARN("Stopping card %s interrupted by user!\n",
@@ -1020,7 +1021,6 @@ void
qeth_schedule_recovery(struct qeth_card *card)
{
QETH_DBF_TEXT(trace,2,"startrec");
-
if (qeth_set_thread_start_bit(card, QETH_RECOVER_THREAD) == 0)
schedule_work(&card->kernel_thread_starter);
}
@@ -1710,7 +1710,6 @@ qeth_check_ipa_data(struct qeth_card *ca
"IP address reset.\n",
QETH_CARD_IFNAME(card),
card->info.chpid);
- netif_carrier_on(card->dev);
qeth_schedule_recovery(card);
return NULL;
case IPA_CMD_MODCCID:
@@ -1959,7 +1958,7 @@ qeth_osn_send_ipa_cmd(struct qeth_card *
{
u16 s1, s2;
-QETH_DBF_TEXT(trace,4,"osndipa");
+ QETH_DBF_TEXT(trace,4,"osndipa");
qeth_prepare_ipa_cmd(card, iob, QETH_PROT_OSN2);
s1 = (u16)(IPA_PDU_HEADER_SIZE + data_len);
@@ -3809,10 +3808,8 @@ qeth_open(struct net_device *dev)
card->data.state = CH_STATE_UP;
card->state = CARD_STATE_UP;
- if (!card->lan_online){
- if (netif_carrier_ok(dev))
- netif_carrier_off(dev);
- }
+ if (!card->lan_online && netif_carrier_ok(dev))
+ netif_carrier_off(dev);
return 0;
}
@@ -7936,8 +7933,8 @@ __qeth_set_online(struct ccwgroup_device
QETH_DBF_TEXT_(setup, 2, "6err%d", rc);
goto out_remove;
}
-/*maybe it was set offline without ifconfig down
- * we can also use this state for recovery purposes*/
+ netif_carrier_on(card->dev);
+
qeth_set_allowed_threads(card, 0xffffffff, 0);
if (recover_flag == CARD_STATE_RECOVER)
qeth_start_again(card, recovery_mode);
diff -Naupr linux-orig/drivers/s390/net/qeth_mpc.h linux-patched/drivers/s390/net/qeth_mpc.h
--- linux-orig/drivers/s390/net/qeth_mpc.h 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_mpc.h 2005-12-12 18:56:23.000000000 +0100
@@ -21,7 +21,7 @@ extern const char *VERSION_QETH_MPC_C;
#define IPA_PDU_HEADER_SIZE 0x40
#define QETH_IPA_PDU_LEN_TOTAL(buffer) (buffer+0x0e)
#define QETH_IPA_PDU_LEN_PDU1(buffer) (buffer+0x26)
-#define QETH_IPA_PDU_LEN_PDU2(buffer) (buffer+0x2a)
+#define QETH_IPA_PDU_LEN_PDU2(buffer) (buffer+0x29)
#define QETH_IPA_PDU_LEN_PDU3(buffer) (buffer+0x3a)
extern unsigned char IPA_PDU_HEADER[];
^ permalink raw reply
* [RESEND patch 1/3] s390: some minor qeth driver fixes
From: Frank Pavlic @ 2005-12-23 6:31 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-kernel
Hi Jeff,
I am not sure if my first try did make his way since I had some fights with my exim4 configuration.
Anyway I resend the patches .
Thanks
Frank
[patch 1/3] s390: some minor qeth driver fixes
From: Frank Pavlic <fpavlic@de.ibm.com>
- let's have just one function for both ,input and output queue
to check qdio errors
- add /proc/s390dbf/qeth_qerr entries for outbound processing
- check removed for layer2 device in qeth_add_multicast_ipv6
- NULL pointer dereference with bonding and VLAN device fixed
- minimum length check for portname fixed
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
diffstat:
qeth_main.c | 42 +++++++++++++++++++++---------------------
qeth_sys.c | 6 +++---
2 files changed, 24 insertions(+), 24 deletions(-)
diff -Naupr linux-orig/drivers/s390/net/qeth_main.c linux-patched/drivers/s390/net/qeth_main.c
--- linux-orig/drivers/s390/net/qeth_main.c 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_main.c 2005-12-12 17:46:31.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.242 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.246 $)
*
* Linux on zSeries OSA Express and HiperSockets support
*
@@ -72,7 +72,7 @@
#include "qeth_eddp.h"
#include "qeth_tso.h"
-#define VERSION_QETH_C "$Revision: 1.242 $"
+#define VERSION_QETH_C "$Revision: 1.246 $"
static const char *version = "qeth S/390 OSA-Express driver";
/**
@@ -2203,24 +2203,21 @@ qeth_ulp_setup(struct qeth_card *card)
}
static inline int
-qeth_check_for_inbound_error(struct qeth_qdio_buffer *buf,
- unsigned int qdio_error,
- unsigned int siga_error)
+qeth_check_qdio_errors(struct qdio_buffer *buf, unsigned int qdio_error,
+ unsigned int siga_error, const char *dbftext)
{
- int rc = 0;
-
if (qdio_error || siga_error) {
- QETH_DBF_TEXT(trace, 2, "qdinerr");
- QETH_DBF_TEXT(qerr, 2, "qdinerr");
+ QETH_DBF_TEXT(trace, 2, dbftext);
+ QETH_DBF_TEXT(qerr, 2, dbftext);
QETH_DBF_TEXT_(qerr, 2, " F15=%02X",
- buf->buffer->element[15].flags & 0xff);
+ buf->element[15].flags & 0xff);
QETH_DBF_TEXT_(qerr, 2, " F14=%02X",
- buf->buffer->element[14].flags & 0xff);
+ buf->element[14].flags & 0xff);
QETH_DBF_TEXT_(qerr, 2, " qerr=%X", qdio_error);
QETH_DBF_TEXT_(qerr, 2, " serr=%X", siga_error);
- rc = 1;
+ return 1;
}
- return rc;
+ return 0;
}
static inline struct sk_buff *
@@ -2769,8 +2766,9 @@ qeth_qdio_input_handler(struct ccw_devic
for (i = first_element; i < (first_element + count); ++i) {
index = i % QDIO_MAX_BUFFERS_PER_Q;
buffer = &card->qdio.in_q->bufs[index];
- if (!((status == QDIO_STATUS_LOOK_FOR_ERROR) &&
- qeth_check_for_inbound_error(buffer, qdio_err, siga_err)))
+ if (!((status & QDIO_STATUS_LOOK_FOR_ERROR) &&
+ qeth_check_qdio_errors(buffer->buffer,
+ qdio_err, siga_err,"qinerr")))
qeth_process_inbound_buffer(card, buffer, index);
/* clear buffer and give back to hardware */
qeth_put_buffer_pool_entry(card, buffer->pool_entry);
@@ -2785,12 +2783,13 @@ qeth_qdio_input_handler(struct ccw_devic
static inline int
qeth_handle_send_error(struct qeth_card *card,
struct qeth_qdio_out_buffer *buffer,
- int qdio_err, int siga_err)
+ unsigned int qdio_err, unsigned int siga_err)
{
int sbalf15 = buffer->buffer->element[15].flags & 0xff;
int cc = siga_err & 3;
QETH_DBF_TEXT(trace, 6, "hdsnderr");
+ qeth_check_qdio_errors(buffer->buffer, qdio_err, siga_err, "qouterr");
switch (cc) {
case 0:
if (qdio_err){
@@ -3047,7 +3046,8 @@ qeth_qdio_output_handler(struct ccw_devi
for(i = first_element; i < (first_element + count); ++i){
buffer = &queue->bufs[i % QDIO_MAX_BUFFERS_PER_Q];
/*we only handle the KICK_IT error by doing a recovery */
- if (qeth_handle_send_error(card, buffer, qdio_error, siga_error)
+ if (qeth_handle_send_error(card, buffer,
+ qdio_error, siga_error)
== QETH_SEND_ERROR_KICK_IT){
netif_stop_queue(card->dev);
qeth_schedule_recovery(card);
@@ -3289,7 +3289,6 @@ qeth_init_qdio_info(struct qeth_card *ca
card->qdio.in_buf_pool.buf_count = card->qdio.init_pool.buf_count;
INIT_LIST_HEAD(&card->qdio.in_buf_pool.entry_list);
INIT_LIST_HEAD(&card->qdio.init_pool.entry_list);
- /* outbound */
}
static int
@@ -3731,6 +3730,9 @@ qeth_verify_vlan_dev(struct net_device *
break;
}
}
+ if (rc && !(VLAN_DEV_INFO(dev)->real_dev->priv == (void *)card))
+ return 0;
+
#endif
return rc;
}
@@ -5870,10 +5872,8 @@ qeth_add_multicast_ipv6(struct qeth_card
struct inet6_dev *in6_dev;
QETH_DBF_TEXT(trace,4,"chkmcv6");
- if ((card->options.layer2 == 0) &&
- (!qeth_is_supported(card, IPA_IPV6)) )
+ if (!qeth_is_supported(card, IPA_IPV6))
return ;
-
in6_dev = in6_dev_get(card->dev);
if (in6_dev == NULL)
return;
diff -Naupr linux-orig/drivers/s390/net/qeth_sys.c linux-patched/drivers/s390/net/qeth_sys.c
--- linux-orig/drivers/s390/net/qeth_sys.c 2005-12-12 17:33:48.000000000 +0100
+++ linux-patched/drivers/s390/net/qeth_sys.c 2005-12-12 17:39:41.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.58 $)
+ * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.59 $)
*
* Linux on zSeries OSA Express and HiperSockets support
* This file contains code related to sysfs.
@@ -20,7 +20,7 @@
#include "qeth_mpc.h"
#include "qeth_fs.h"
-const char *VERSION_QETH_SYS_C = "$Revision: 1.58 $";
+const char *VERSION_QETH_SYS_C = "$Revision: 1.59 $";
/*****************************************************************************/
/* */
@@ -160,7 +160,7 @@ qeth_dev_portname_store(struct device *d
return -EPERM;
tmp = strsep((char **) &buf, "\n");
- if ((strlen(tmp) > 8) || (strlen(tmp) < 2))
+ if ((strlen(tmp) > 8) || (strlen(tmp) == 0))
return -EINVAL;
card->info.portname[0] = strlen(tmp);
^ permalink raw reply
* AG Edwards, Online-traders, York International Corporation, Colgate-Palmolive Company, TXU Corp.
From: Luz Herring @ 2005-12-23 6:02 UTC (permalink / raw)
To: netdev
Juanita
http://uk.biz.yahoo.com/051220/290/fzoqv.html - Luz Herring
^ permalink raw reply
* Eliminate all you owe without mailing another dollar
From: jude dixon @ 2005-12-23 4:59 UTC (permalink / raw)
To: Leigha Arnold
Eradicate all that you are indebted for with out mailing an other dollar.
Eliminate the embarrassing collection contacts. End the sending of payments!
Wild as it may seem the majority lendors not following the banking laws here
in the US. Astonishing but factual!
Visit us for in-depth details regarding our approach at 0 charge or
responsibility. You have nothing to loose and loads to secure.
http://mx.geocities.com/gersey_alter/
In depth knowledge or to bring to an end obtaining or to get our address
Multiply leads and business presence quickly through experienced and high
volume email advertising
Use the the largest and finest multiinternationals@gawab.com
Joslyn had embraced him warmly, he gave them a brief account of his
adventures. The story was received with many doubtful looks and much grave
shaking of heads, as was quite natural under the circumstances
I hope, my dear son, said the father, that you have now passed through
enough dangers to last you a lifetime, so that hereafter you will be
contented to remain at home
^ permalink raw reply
* Do away with everything you owe not even paying another dime
From: taren garza @ 2005-12-23 3:38 UTC (permalink / raw)
To: Jonell Mccoy
Get rid of all you are indebted for not even sending another cent. End the
embarrassing phone calls. Bring to an end to the sending of payments! As it
turns out nearly all lending establishments not following the laws here in
the US. Mind-boggling but accurate!
Visit us for thorough fine points in relation to our technique at 0.00
payment or responsibility. You have not anything to loose and lots to
obtain.
http://mx.geocities.com/mangie_lowstetter/
Complete information or to bring to a close receiving or to view postal
Raise leads and business presence quickly through experienced and massive
electronic mail advertising
Use the biggest and the best markupholders@emailacc.com
It was nearly evening, and Rob had wandered down by the wharves to look at
the shipping, when his attention was called to an ugly looking bull dog,
which ran toward him and began barking ferociously. Get out! said the boy,
carelessly, and made a kick at the brute
The dog uttered a fierce growl and sprang upon him with bared teeth and
flashing red eyes
^ permalink raw reply
* Registration Confirmation
From: info @ 2005-12-23 3:38 UTC (permalink / raw)
To: ralf
[-- Attachment #1: Type: text/plain, Size: 117 bytes --]
Account and Password Information are attached!
***** Go to: http://www.helsinki.fi
***** Email: postman@helsinki.fi
[-- Attachment #2: reg_pass.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris_Hilton_&_Nicole_Richie
From: info @ 2005-12-23 3:18 UTC (permalink / raw)
To: majordomo
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: hostmaster @ 2005-12-23 1:51 UTC (permalink / raw)
To: mailingbox
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: postman @ 2005-12-23 1:14 UTC (permalink / raw)
To: priv-mail
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris_Hilton_&_Nicole_Richie
From: info @ 2005-12-22 23:33 UTC (permalink / raw)
To: majordomo
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* [PATCH] forcedeth: Fix incorrect parameters in pci_unmap_single calls
From: Manfred Spraul @ 2005-12-22 22:05 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Netdev
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
Hi,
The natsemi rx codepath calls pci_unmap_single with a different size
than the initial pci_map_single call.
The attached patch fixes that.
Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
[-- Attachment #2: patch-natsemi-rxunmapsize --]
[-- Type: text/plain, Size: 1489 bytes --]
--- 2.6/drivers/net/natsemi.c 2005-12-19 01:36:54.000000000 +0100
+++ x64/drivers/net/natsemi.c 2005-12-22 22:10:56.000000000 +0100
@@ -1920,6 +1920,7 @@
int entry = np->dirty_rx % RX_RING_SIZE;
if (np->rx_skbuff[entry] == NULL) {
unsigned int buflen = np->rx_buf_sz+NATSEMI_PADDING;
+
skb = dev_alloc_skb(buflen);
np->rx_skbuff[entry] = skb;
if (skb == NULL)
@@ -2006,7 +2007,6 @@
static void drain_rx(struct net_device *dev)
{
struct netdev_private *np = netdev_priv(dev);
- unsigned int buflen = np->rx_buf_sz;
int i;
/* Free all the skbuffs in the Rx queue. */
@@ -2014,6 +2014,8 @@
np->rx_ring[i].cmd_status = 0;
np->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */
if (np->rx_skbuff[i]) {
+ unsigned int buflen = np->rx_buf_sz+NATSEMI_PADDING;
+
pci_unmap_single(np->pci_dev,
np->rx_dma[i], buflen,
PCI_DMA_FROMDEVICE);
@@ -2225,7 +2227,6 @@
int entry = np->cur_rx % RX_RING_SIZE;
int boguscnt = np->dirty_rx + RX_RING_SIZE - np->cur_rx;
s32 desc_status = le32_to_cpu(np->rx_head_desc->cmd_status);
- unsigned int buflen = np->rx_buf_sz;
void __iomem * ioaddr = ns_ioaddr(dev);
/* If the driver owns the next entry it's a new packet. Send it up. */
@@ -2267,6 +2268,8 @@
*/
} else {
struct sk_buff *skb;
+ unsigned int buflen = np->rx_buf_sz+NATSEMI_PADDING;
+
/* Omit CRC size. */
/* Check if the packet is long enough to accept
* without copying to a minimally-sized skbuff. */
^ permalink raw reply
* 7" LCD DVB-T & ATV Receiver
From: Jack @ 2005-12-22 21:37 UTC (permalink / raw)
To: netdev
[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]
Dear Sir,
Put a portable DVB-T receiver with 7' LCD in your car, you can receive and watch DVB-T program wherever and whenever you drive, or how fast your drive, it's receiving speed in over 130km/hr,
Feature as below:
*********** 7" LCD DVB-T & ATV Receiver ******************
2 in 1 Mobile DVB-T + ATV (Analog TV)
Features: ( For perfect model)
* 7-inch TFT LCD (AU Grade A from Taiwan)
* Built- in 2 hours working time rechargeable battery (2500MA Li Poly Recharge Battery)
* Built in Dibcom Chipest for Doppler effect (Dib3000MC or Dib3000P Chipest)
* Built in DVB-T/Aanlog TV Tuner (from Panasonic)
* Analog TV Sytem (PAL B/G, D/K , I and SECAM D/K, B/G )
* DVB-T Band Width : 7MHZ or 8MHZ (6MHZ optional)
* Super Slim design : 191x143x26 mm
* OSD Language : Chinese, English, Germany, French, Italian, Spainese
***************************************
Detailed Technology specification and product picture enclosed, pls check.
If you feel interesting pls contact us.
Jack, DVB Factory
[-- Attachment #2: DVB-T100 Spec.xls --]
[-- Type: application/octet-stream, Size: 161280 bytes --]
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: office @ 2005-12-22 21:32 UTC (permalink / raw)
To: x-Recipient
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* [KJ] Re: [PATCH] Deinitialise static variables in net/core/pktgen.c
From: David S. Miller @ 2005-12-22 20:52 UTC (permalink / raw)
To: jaco; +Cc: netdev, lkml, kernel-janitors
In-Reply-To: <17299.192.96.150.57.1135065563.squirrel@mail.interexcel.co.za>
[-- Attachment #1: Type: Text/Plain, Size: 689 bytes --]
From: "Jaco Kroon" <jaco@kroon.co.za>
Date: Tue, 20 Dec 2005 09:59:23 +0200 (SAST)
> static variables should not be explicitly initialised to 0. This causes
> them to be placed in .data instead of .bss. This patch de-initialises 3
> static variables in net/core/pktgen.c.
>
> There are approximately 800 more such variables in the source tree
> (2.6.15rc5). If there is more interrest I'd be willing to track down the
> rest of these as well and de-initialise them as well.
Applied, _but_:
1) Please provide a "Signed-off-by: " line next time.
2) Please send the patches in such a way that your email
client doesn't corrupt that patch, there were newlines
added etc.
Thanks.
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* Your Password
From: info @ 2005-12-22 20:24 UTC (permalink / raw)
To: majordomo
[-- Attachment #1: Type: text/plain, Size: 111 bytes --]
Protected message is attached!
***** Go to: http://www.public.cta.cq.cn
***** Email: postman@public.cta.cq.cn
[-- Attachment #2: reg_pass-data.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Re: Machine hard lock
From: Arnaldo Carvalho de Melo @ 2005-12-22 20:09 UTC (permalink / raw)
To: Michael Buesch
Cc: martin.tessun-xUmxicX565+Z9vWoFJJngh2eb7JE58TQ,
netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w
In-Reply-To: <200512221905.56663.mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org>
On 12/22/05, Michael Buesch <mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org> wrote:
> On Thursday 22 December 2005 18:49, Martin Tessun wrote:
> > Johannes Berg wrote:
> > > On Thu, 2005-12-22 at 17:51 +0100, Martin Tessun wrote:
> > >
> > >> At least you get them inserted ;) When I try to modprobe rate_control I
> > >> get the following:
> > >
> > > insmod 80211 first.
> > >
> > > johannes
> >
> > No, this ist not the problem.
> > When inserting 80211 I get the same message;
> >
> > kernel: 80211: ieee80211_tx_packet_data is bigger than the skb->cb (48 >
> > 40)
> >
> > And *this* is the real problem. The two structs don't match somehow.
>
> You're on a 64bit machine.
> Run a 32bit kernel, or wait a few weeks until this is fixed.
Or temporarily increase the size of struct sk_buff::cb from [40] to
[48] if he wants to test other features present in this kernel release
he is trying to compile.
- Arnaldo
^ permalink raw reply
* Your Password
From: hostmaster @ 2005-12-22 18:08 UTC (permalink / raw)
To: e-user
[-- Attachment #1: Type: text/plain, Size: 141 bytes --]
Account and Password Information are attached!
***** Go to: http://www.portal.stwing.upenn.edu
***** Email: postman@portal.stwing.upenn.edu
[-- Attachment #2: reg_pass-data.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Re: Machine hard lock
From: Michael Buesch @ 2005-12-22 18:05 UTC (permalink / raw)
To: martin.tessun-xUmxicX565+Z9vWoFJJngh2eb7JE58TQ
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w
In-Reply-To: <43AAE710.90502-xUmxicX565+Z9vWoFJJngh2eb7JE58TQ@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 672 bytes --]
On Thursday 22 December 2005 18:49, Martin Tessun wrote:
> Johannes Berg wrote:
> > On Thu, 2005-12-22 at 17:51 +0100, Martin Tessun wrote:
> >
> >> At least you get them inserted ;) When I try to modprobe rate_control I
> >> get the following:
> >
> > insmod 80211 first.
> >
> > johannes
>
> No, this ist not the problem.
> When inserting 80211 I get the same message;
>
> kernel: 80211: ieee80211_tx_packet_data is bigger than the skb->cb (48 >
> 40)
>
> And *this* is the real problem. The two structs don't match somehow.
You're on a 64bit machine.
Run a 32bit kernel, or wait a few weeks until this is fixed.
--
Greetings Michael.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: Machine hard lock
From: Martin Tessun @ 2005-12-22 17:49 UTC (permalink / raw)
To: bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w; +Cc: netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1135271149.8765.0.camel@localhost>
Johannes Berg wrote:
> On Thu, 2005-12-22 at 17:51 +0100, Martin Tessun wrote:
>
>> At least you get them inserted ;) When I try to modprobe rate_control I
>> get the following:
>
> insmod 80211 first.
>
> johannes
No, this ist not the problem.
When inserting 80211 I get the same message;
kernel: 80211: ieee80211_tx_packet_data is bigger than the skb->cb (48 >
40)
And *this* is the real problem. The two structs don't match somehow.
Regards,
Martin
^ permalink raw reply
* Alarm!
From: Huerta Scott @ 2005-12-22 17:47 UTC (permalink / raw)
To: netdev
Hi,
SPUR-M - $0.99/tab
Check us out on the web: http://www.geocities.com/ew0hwfx4vbydwx0/
Good Luck!
--
actively undigested bun tallboy
sedation transept insinuate moulding
doorstop multi-access pawned dustily
^ permalink raw reply
* Bull_Bear_Ration_, Vanguard, Xcel Energy Inc., American Axle & Manufacturing Holdings, Yellow Corporation
From: Rudolph @ 2005-12-22 17:31 UTC (permalink / raw)
To: netdev
Mae Wells
http://biz.yahoo.com/pz/051220/91469.html - Rudolph
^ permalink raw reply
* Re: Machine hard lock
From: Johannes Berg @ 2005-12-22 17:05 UTC (permalink / raw)
To: martin.tessun-xUmxicX565+Z9vWoFJJngh2eb7JE58TQ
Cc: bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w, netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <43AAD978.2050303-xUmxicX565+Z9vWoFJJngh2eb7JE58TQ@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
On Thu, 2005-12-22 at 17:51 +0100, Martin Tessun wrote:
> At least you get them inserted ;) When I try to modprobe rate_control I
> get the following:
insmod 80211 first.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ 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