Attachment #70202 for bug #92106

View | Details | Raw Unified | Return to bug 92106
Collapse All | Expand All

Lines 179-182 static inline void ib_net_schedule(struc Link Here

(-)ib-net.h.orig (-1 / +1 lines)
179	extern void ib_net_parse(struct ib_net_modem_t *modem, int nbuf);	179	extern void ib_net_parse(struct ib_net_modem_t *modem, int nbuf);
180	extern int ib_net_fill(struct ib_net_modem_t *modem);	180	extern int ib_net_fill(struct ib_net_modem_t *modem);
181	extern void ib_net_deregister(struct ib_net_modem_t *modem);	181	extern void ib_net_deregister(struct ib_net_modem_t *modem);
182	extern struct ib_net_modem_t ib_net_register(u_char name);	182	extern struct ib_net_modem_t ib_net_register(u_char name, struct device *device);

Lines 291-297 static int ib_net_ioctl(struct net_devic Link Here

(-)ib-net.c.orig (-1 / +3 lines)
291	* ib_net_register - register network device.	291	* ib_net_register - register network device.
292	* @name: return device name.	292	* @name: return device name.
293	*/	293	*/
294	struct ib_net_modem_t ib_net_register(u_char name)	294	struct ib_net_modem_t ib_net_register(u_char name, struct device *device)
295	{	295	{
296	struct ib_net_modem_t *modem;	296	struct ib_net_modem_t *modem;
297	struct net_device *dev;	297	struct net_device *dev;
Lines 315-320 struct ib_net_modem_t *ib_net_register(u Link Here
315	dev->tx_timeout = ib_net_tx_timeout;	315	dev->tx_timeout = ib_net_tx_timeout;
316	dev->watchdog_timeo = HZ * 10;	316	dev->watchdog_timeo = HZ * 10;
317	strcpy(dev->name, ifname);	317	strcpy(dev->name, ifname);
		318	if (device != NULL)
		319	SET_NETDEV_DEV(dev, device);
318	if (register_netdev(dev)) {	320	if (register_netdev(dev)) {
319	kfree(modem);	321	kfree(modem);
320	return NULL;	322	return NULL;

Lines 742-748 next_entry: Link Here

(-)ib-pcmcia.c.orig (-1 / +1 lines)
742	if (local->mem == NULL)	742	if (local->mem == NULL)
743	goto failed3;	743	goto failed3;
744	local->ctl = local->mem + (version < 2 ? 0x0800 : 0x1000);	744	local->ctl = local->mem + (version < 2 ? 0x0800 : 0x1000);
745	local->modem = ib_net_register(local->node.dev_name);	745	local->modem = ib_net_register(local->node.dev_name, &handle_to_dev(handle));
746	if (local->modem == NULL)	746	if (local->modem == NULL)
747	goto failed4;	747	goto failed4;
748	ib_net_addr(local->modem, local->mem + OFFSET_UT_ETHERNET);	748	ib_net_addr(local->modem, local->mem + OFFSET_UT_ETHERNET);

Lines 290-296 static int ib_usb_probe(struct usb_inter Link Here

(-)ib-usb.c.orig (-1 / +1 lines)
290	DEBUG(1, "ib-usb: invalid response\n");	290	DEBUG(1, "ib-usb: invalid response\n");
291	goto failed;	291	goto failed;
292	}	292	}
293	priv->modem = ib_net_register(NULL);	293	priv->modem = ib_net_register(NULL, NULL);
294	if (priv->modem == NULL) {	294	if (priv->modem == NULL) {
295	DEBUG(1, "ib-usb: ib_net_register failed\n");	295	DEBUG(1, "ib-usb: ib_net_register failed\n");
296	goto failed;	296	goto failed;

Return to bug 92106