aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorRahul Bedarkar <rahulbedarkar89@gmail.com>2014-01-04 03:39:45 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-07 19:19:30 -0500
commit521aea08e3b8203a3f4211b1b6c37a4c1533e6e2 (patch)
tree6ddf3387f8c9747fcab570f46b6e6ff44d563535 /drivers/usb
parent62316ff4bc619d5c0ac9d08c95e67282162dc93b (diff)
USB: wusbcore: fix up line break coding style issues in security.c
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/wusbcore/security.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index c322dca5ee4b..95be9953cd47 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -33,7 +33,8 @@ static void wusbhc_gtk_rekey_work(struct work_struct *work);
33 33
34int wusbhc_sec_create(struct wusbhc *wusbhc) 34int wusbhc_sec_create(struct wusbhc *wusbhc)
35{ 35{
36 wusbhc->gtk.descr.bLength = sizeof(wusbhc->gtk.descr) + sizeof(wusbhc->gtk.data); 36 wusbhc->gtk.descr.bLength = sizeof(wusbhc->gtk.descr) +
37 sizeof(wusbhc->gtk.data);
37 wusbhc->gtk.descr.bDescriptorType = USB_DT_KEY; 38 wusbhc->gtk.descr.bDescriptorType = USB_DT_KEY;
38 wusbhc->gtk.descr.bReserved = 0; 39 wusbhc->gtk.descr.bReserved = 0;
39 wusbhc->gtk_index = 0; 40 wusbhc->gtk_index = 0;
@@ -138,7 +139,7 @@ const char *wusb_et_name(u8 x)
138 case USB_ENC_TYPE_WIRED: return "wired"; 139 case USB_ENC_TYPE_WIRED: return "wired";
139 case USB_ENC_TYPE_CCM_1: return "CCM-1"; 140 case USB_ENC_TYPE_CCM_1: return "CCM-1";
140 case USB_ENC_TYPE_RSA_1: return "RSA-1"; 141 case USB_ENC_TYPE_RSA_1: return "RSA-1";
141 default: return "unknown"; 142 default: return "unknown";
142 } 143 }
143} 144}
144EXPORT_SYMBOL_GPL(wusb_et_name); 145EXPORT_SYMBOL_GPL(wusb_et_name);
@@ -222,7 +223,8 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc,
222 secd_size = le16_to_cpu(secd->wTotalLength); 223 secd_size = le16_to_cpu(secd->wTotalLength);
223 new_secd = krealloc(secd, secd_size, GFP_KERNEL); 224 new_secd = krealloc(secd, secd_size, GFP_KERNEL);
224 if (new_secd == NULL) { 225 if (new_secd == NULL) {
225 dev_err(dev, "Can't allocate space for security descriptors\n"); 226 dev_err(dev,
227 "Can't allocate space for security descriptors\n");
226 goto out; 228 goto out;
227 } 229 }
228 secd = new_secd; 230 secd = new_secd;
@@ -377,7 +379,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
377 hs[0].bReserved = 0; 379 hs[0].bReserved = 0;
378 memcpy(hs[0].CDID, &wusb_dev->cdid, sizeof(hs[0].CDID)); 380 memcpy(hs[0].CDID, &wusb_dev->cdid, sizeof(hs[0].CDID));
379 get_random_bytes(&hs[0].nonce, sizeof(hs[0].nonce)); 381 get_random_bytes(&hs[0].nonce, sizeof(hs[0].nonce));
380 memset(hs[0].MIC, 0, sizeof(hs[0].MIC)); /* Per WUSB1.0[T7-22] */ 382 memset(hs[0].MIC, 0, sizeof(hs[0].MIC)); /* Per WUSB1.0[T7-22] */
381 383
382 result = usb_control_msg( 384 result = usb_control_msg(
383 usb_dev, usb_sndctrlpipe(usb_dev, 0), 385 usb_dev, usb_sndctrlpipe(usb_dev, 0),
@@ -424,7 +426,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
424 } 426 }
425 427
426 /* Setup the CCM nonce */ 428 /* Setup the CCM nonce */
427 memset(&ccm_n.sfn, 0, sizeof(ccm_n.sfn)); /* Per WUSB1.0[6.5.2] */ 429 memset(&ccm_n.sfn, 0, sizeof(ccm_n.sfn)); /* Per WUSB1.0[6.5.2] */
428 memcpy(ccm_n.tkid, &tkid_le, sizeof(ccm_n.tkid)); 430 memcpy(ccm_n.tkid, &tkid_le, sizeof(ccm_n.tkid));
429 ccm_n.src_addr = wusbhc->uwb_rc->uwb_dev.dev_addr; 431 ccm_n.src_addr = wusbhc->uwb_rc->uwb_dev.dev_addr;
430 ccm_n.dest_addr.data[0] = wusb_dev->addr; 432 ccm_n.dest_addr.data[0] = wusb_dev->addr;
@@ -555,11 +557,13 @@ static void wusbhc_gtk_rekey_work(struct work_struct *work)
555 list_for_each_entry_safe(wusb_dev, wusb_dev_next, &rekey_list, 557 list_for_each_entry_safe(wusb_dev, wusb_dev_next, &rekey_list,
556 rekey_node) { 558 rekey_node) {
557 list_del_init(&wusb_dev->rekey_node); 559 list_del_init(&wusb_dev->rekey_node);
558 dev_dbg(&wusb_dev->usb_dev->dev, "%s: rekey device at port %d\n", 560 dev_dbg(&wusb_dev->usb_dev->dev,
561 "%s: rekey device at port %d\n",
559 __func__, wusb_dev->port_idx); 562 __func__, wusb_dev->port_idx);
560 563
561 if (wusb_dev_set_gtk(wusbhc, wusb_dev) < 0) { 564 if (wusb_dev_set_gtk(wusbhc, wusb_dev) < 0) {
562 dev_err(&wusb_dev->usb_dev->dev, "%s: rekey device at port %d failed\n", 565 dev_err(&wusb_dev->usb_dev->dev,
566 "%s: rekey device at port %d failed\n",
563 __func__, wusb_dev->port_idx); 567 __func__, wusb_dev->port_idx);
564 } 568 }
565 wusb_dev_put(wusb_dev); 569 wusb_dev_put(wusb_dev);