aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2008-01-25 17:50:55 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-31 22:26:54 -0500
commit9ff55874fea71f483581f48990658d3929adb034 (patch)
treefa6eb7d88cef670b3bcc2d0ba0544dd1cba28df3 /drivers/net
parent04c3c01a21a098140678ab9369cc0487775b8df6 (diff)
rndis_host: Halt device if rndis_bind fails.
When bind fails after device was initialized, shutdown device properly by sending RNDIS_MSG_HALT. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: Bjorge Dijkstra <bjd@jooz.net> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/usb/rndis_host.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 42b161c94618..c6860250521b 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -467,6 +467,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
467 struct rndis_query_c *get_c; 467 struct rndis_query_c *get_c;
468 struct rndis_set *set; 468 struct rndis_set *set;
469 struct rndis_set_c *set_c; 469 struct rndis_set_c *set_c;
470 struct rndis_halt *halt;
470 } u; 471 } u;
471 u32 tmp; 472 u32 tmp;
472 int reply_len; 473 int reply_len;
@@ -517,7 +518,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
517 "dev can't take %u byte packets (max %u)\n", 518 "dev can't take %u byte packets (max %u)\n",
518 dev->hard_mtu, tmp); 519 dev->hard_mtu, tmp);
519 retval = -EINVAL; 520 retval = -EINVAL;
520 goto fail_and_release; 521 goto halt_fail_and_release;
521 } 522 }
522 dev->hard_mtu = tmp; 523 dev->hard_mtu = tmp;
523 net->mtu = dev->hard_mtu - net->hard_header_len; 524 net->mtu = dev->hard_mtu - net->hard_header_len;
@@ -539,7 +540,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
539 48, (void **) &bp, &reply_len); 540 48, (void **) &bp, &reply_len);
540 if (unlikely(retval< 0)) { 541 if (unlikely(retval< 0)) {
541 dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); 542 dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval);
542 goto fail_and_release; 543 goto halt_fail_and_release;
543 } 544 }
544 memcpy(net->dev_addr, bp, ETH_ALEN); 545 memcpy(net->dev_addr, bp, ETH_ALEN);
545 546
@@ -555,7 +556,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
555 retval = rndis_command(dev, u.header); 556 retval = rndis_command(dev, u.header);
556 if (unlikely(retval < 0)) { 557 if (unlikely(retval < 0)) {
557 dev_err(&intf->dev, "rndis set packet filter, %d\n", retval); 558 dev_err(&intf->dev, "rndis set packet filter, %d\n", retval);
558 goto fail_and_release; 559 goto halt_fail_and_release;
559 } 560 }
560 561
561 retval = 0; 562 retval = 0;
@@ -563,6 +564,11 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
563 kfree(u.buf); 564 kfree(u.buf);
564 return retval; 565 return retval;
565 566
567halt_fail_and_release:
568 memset(u.halt, 0, sizeof *u.halt);
569 u.halt->msg_type = RNDIS_MSG_HALT;
570 u.halt->msg_len = ccpu2(sizeof *u.halt);
571 (void) rndis_command(dev, (void *)u.halt);
566fail_and_release: 572fail_and_release:
567 usb_set_intfdata(info->data, NULL); 573 usb_set_intfdata(info->data, NULL);
568 usb_driver_release_interface(driver_of(intf), info->data); 574 usb_driver_release_interface(driver_of(intf), info->data);