Skip to contentSkip to conversation

merge request for WiMAX kernel stack and i2400m driver

PATCH In review Inaky Perez-Gonzalez 4 participants 49 messages Nov 24, 2008 – Nov 26, 2008 Page 2 of 2

Subsystems (3)
lore
Share & tools
lore
#47 lore raw
In reply to David Miller
Quoted 8 lines · David Miller

From: Inaky Perez-Gonzalez <[email protected]>
Date: Mon, 24 Nov 2008 13:50:23 -0800

Quoted 4 lines

This patchset (or the linux-wimax GIT tree at git.kernel.org) merges the WiMAX subsystem and driver for the Intel 2400m Wireless WiMAX connection to the tree. We'd like to get it in for the 2.6.29 merge window.

Quoted 6 lines

You've made this difficult by creating the dependency on the USB changes.

So I can't, for example, merge this into the networking tree. Is there some way you can make the driver work without the USB changes even with some hack?

I know, but there was little choice. The error paths for device recovery depend on those changes. That's why I suggest posting through gregkh's tree once you guys give your approval. Then after it goes into the first merge window and it permeates to your tree, I'll rebase the linux-wimax tree to have you as upstream.

Quoted 3 lines

Second, put the wimax stack stuff under net/wimax just like we do for net/mac80211 et al. Then just the drivers go under drivers/net/wimax

Oh, good point. Will do.

I'll send updated patches today.

Thanks,

Signature · 1 line
Inaky
maintainer
#48 lore raw

From: Inaky Perez-Gonzalez <[email protected]>
Date: Tue, 25 Nov 2008 08:57:10 -0800

Quoted 16 lines · David Miller
Quoted 8 lines

From: Inaky Perez-Gonzalez <[email protected]>
Date: Mon, 24 Nov 2008 13:50:23 -0800

Quoted 4 lines

This patchset (or the linux-wimax GIT tree at git.kernel.org) merges the WiMAX subsystem and driver for the Intel 2400m Wireless WiMAX connection to the tree. We'd like to get it in for the 2.6.29 merge window.

Quoted 6 lines

You've made this difficult by creating the dependency on the USB changes.

So I can't, for example, merge this into the networking tree. Is there some way you can make the driver work without the USB changes even with some hack?

Quoted 5 lines

I know, but there was little choice. The error paths for device recovery depend on those changes. That's why I suggest posting through gregkh's tree once you guys give your approval. Then after it goes into the first merge window and it permeates to your tree, I'll rebase the linux-wimax tree to have you as upstream.

Ok, maybe that's what we'll have to do.

#24 lore raw

Re: [PATCH 19/39] i2400m: sysfs controls

In reply to Inaky Perez-Gonzalez

Hi.

Spotted an issue.

Quoted 7 lines · Inaky Perez-Gonzalez
drivers/net/wimax/i2400m/sysfs.c new file +7 -0
+static
+ssize_t i2400m_reset_cold_store(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf, size_t size)
+{
+	ssize_t result;
+	struct i2400m *i2400m = net_dev_to_i2400m(to_net_dev(dev));

drivers/net/wimax/i2400m/sysfs.c line 78

Quoted 10 lines
drivers/net/wimax/i2400m/sysfs.c new file +10 -0
+	unsigned val;
+
+	result = -EINVAL;
+	if (sscanf(buf, "%u\n", &val) != 1)
+		goto error_no_unsigned;
+	if (val != 1)
+		goto error_bad_value;
+	i2400m_schedule_work(i2400m, __i2400m_reset_cold_work, GFP_KERNEL);
+	if (result >= 1)
+		result = size;

This never executes since result is always -EINVAL, isn't it?

Quoted 5 lines
drivers/net/wimax/i2400m/sysfs.c new file +5 -0
+error_no_unsigned:
+error_bad_value:
+	return result;
+}
+
Signature · 1 line
	Evgeniy Polyakov
#25 lore raw

Re: [PATCH 19/39] i2400m: sysfs controls

Quoted 5 lines · Evgeniy Polyakov

Hi.

Spotted an issue.

On Mon, Nov 24, 2008 at 01:50:42PM -0800, Inaky Perez-Gonzalez

Quoted 11 lines · ([email protected]) wrote:
Quoted 11 lines
drivers/net/wimax/i2400m/sysfs.c new file +11 -0
+static
+ssize_t i2400m_reset_cold_store(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf, size_t size)
+{
+	ssize_t result;
+	struct i2400m *i2400m = net_dev_to_i2400m(to_net_dev(dev));
+	unsigned val;
+
+	result = -EINVAL;
+	if (sscanf(buf, "%u\n", &val) != 1)
Quoted 8 lines

drivers/net/wimax/i2400m/sysfs.c line 78

Quoted 6 lines
drivers/net/wimax/i2400m/sysfs.c new file +6 -0
+		goto error_no_unsigned;
+	if (val != 1)
+		goto error_bad_value;
+	i2400m_schedule_work(i2400m, __i2400m_reset_cold_work, GFP_KERNEL);
+	if (result >= 1)
+		result = size;

This never executes since result is always -EINVAL, isn't it?

Right -- the thing is scheduled by to the user it always returns -EINVAl. Good catch, thanks -- fixing it.

Signature · 1 line
Inaky