util.c (92fd4d4d67b945c0766416284d4ab236b31542c4) util.c (e9c0268f02f8970149158a9b7ea1e5c1c45c819d)
1/*
2 * Wireless utility functions
3 *
4 * Copyright 2007-2009 Johannes Berg <johannes@sipsolutions.net>
5 */
6#include <linux/bitops.h>
7#include <linux/etherdevice.h>
8#include <linux/slab.h>

--- 488 unchanged lines hidden (view full) ---

497 head_need = hdrlen + encaps_len - skb_headroom(skb);
498
499 if (head_need > 0 || skb_cloned(skb)) {
500 head_need = max(head_need, 0);
501 if (head_need)
502 skb_orphan(skb);
503
504 if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC)) {
1/*
2 * Wireless utility functions
3 *
4 * Copyright 2007-2009 Johannes Berg <johannes@sipsolutions.net>
5 */
6#include <linux/bitops.h>
7#include <linux/etherdevice.h>
8#include <linux/slab.h>

--- 488 unchanged lines hidden (view full) ---

497 head_need = hdrlen + encaps_len - skb_headroom(skb);
498
499 if (head_need > 0 || skb_cloned(skb)) {
500 head_need = max(head_need, 0);
501 if (head_need)
502 skb_orphan(skb);
503
504 if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC)) {
505 printk(KERN_ERR "failed to reallocate Tx buffer\n");
505 pr_err("failed to reallocate Tx buffer\n");
506 return -ENOMEM;
507 }
508 skb->truesize += head_need;
509 }
510
511 if (encaps_data) {
512 memcpy(skb_push(skb, encaps_len), encaps_data, encaps_len);
513 nh_pos += encaps_len;

--- 166 unchanged lines hidden (view full) ---

680 if (!wdev->connect_keys)
681 return;
682
683 for (i = 0; i < 6; i++) {
684 if (!wdev->connect_keys->params[i].cipher)
685 continue;
686 if (rdev->ops->add_key(wdev->wiphy, dev, i, false, NULL,
687 &wdev->connect_keys->params[i])) {
506 return -ENOMEM;
507 }
508 skb->truesize += head_need;
509 }
510
511 if (encaps_data) {
512 memcpy(skb_push(skb, encaps_len), encaps_data, encaps_len);
513 nh_pos += encaps_len;

--- 166 unchanged lines hidden (view full) ---

680 if (!wdev->connect_keys)
681 return;
682
683 for (i = 0; i < 6; i++) {
684 if (!wdev->connect_keys->params[i].cipher)
685 continue;
686 if (rdev->ops->add_key(wdev->wiphy, dev, i, false, NULL,
687 &wdev->connect_keys->params[i])) {
688 printk(KERN_ERR "%s: failed to set key %d\n",
689 dev->name, i);
688 netdev_err(dev, "failed to set key %d\n", i);
690 continue;
691 }
692 if (wdev->connect_keys->def == i)
693 if (rdev->ops->set_default_key(wdev->wiphy, dev, i)) {
689 continue;
690 }
691 if (wdev->connect_keys->def == i)
692 if (rdev->ops->set_default_key(wdev->wiphy, dev, i)) {
694 printk(KERN_ERR "%s: failed to set defkey %d\n",
695 dev->name, i);
693 netdev_err(dev, "failed to set defkey %d\n", i);
696 continue;
697 }
698 if (wdev->connect_keys->defmgmt == i)
699 if (rdev->ops->set_default_mgmt_key(wdev->wiphy, dev, i))
694 continue;
695 }
696 if (wdev->connect_keys->defmgmt == i)
697 if (rdev->ops->set_default_mgmt_key(wdev->wiphy, dev, i))
700 printk(KERN_ERR "%s: failed to set mgtdef %d\n",
701 dev->name, i);
698 netdev_err(dev, "failed to set mgtdef %d\n", i);
702 }
703
704 kfree(wdev->connect_keys);
705 wdev->connect_keys = NULL;
706}
707
708static void cfg80211_process_wdev_events(struct wireless_dev *wdev)
709{

--- 179 unchanged lines hidden --- 		699 }
700
701 kfree(wdev->connect_keys);
702 wdev->connect_keys = NULL;
703}
704
705static void cfg80211_process_wdev_events(struct wireless_dev *wdev)
706{

--- 179 unchanged lines hidden ---