cfg80211: fix extension channel checks to initiate communication

[net-next-2.6.git] / net / caif / cfveil.c

diff --git a/net/caif/cfveil.c b/net/caif/cfveil.c
index e04f7d964e83ea8d0c88308bb0fcd2e3dd9dfbd6..3b425b189a99f7dc55885ccf61fa2d951ec12ee1 100644 (file)
--- a/net/caif/cfveil.c
+++ b/net/caif/cfveil.c
@@ -4,6 +4,8 @@
  * License terms: GNU General Public License (GPL) version 2
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
+
 #include <linux/stddef.h>
 #include <linux/slab.h>
 #include <net/caif/caif_layer.h>
@@ -25,12 +27,12 @@ struct cflayer *cfvei_create(u8 channel_id, struct dev_info *dev_info)
 {
        struct cfsrvl *vei = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
        if (!vei) {
-               pr_warning("CAIF: %s(): Out of memory\n", __func__);
+               pr_warn("Out of memory\n");
                return NULL;
        }
        caif_assert(offsetof(struct cfsrvl, layer) == 0);
        memset(vei, 0, sizeof(struct cfsrvl));
-       cfsrvl_init(vei, channel_id, dev_info);
+       cfsrvl_init(vei, channel_id, dev_info, true);
        vei->layer.receive = cfvei_receive;
        vei->layer.transmit = cfvei_transmit;
        snprintf(vei->layer.name, CAIF_LAYER_NAME_SZ - 1, "vei%d", channel_id);
@@ -47,7 +49,7 @@ static int cfvei_receive(struct cflayer *layr, struct cfpkt *pkt)
 
 
        if (cfpkt_extr_head(pkt, &cmd, 1) < 0) {
-               pr_err("CAIF: %s(): Packet is erroneous!\n", __func__);
+               pr_err("Packet is erroneous!\n");
                cfpkt_destroy(pkt);
                return -EPROTO;
        }
@@ -67,8 +69,7 @@ static int cfvei_receive(struct cflayer *layr, struct cfpkt *pkt)
                cfpkt_destroy(pkt);
                return 0;
        default:                /* SET RS232 PIN */
-               pr_warning("CAIF: %s():Unknown VEI control packet %d (0x%x)!\n",
-                          __func__, cmd, cmd);
+               pr_warn("Unknown VEI control packet %d (0x%x)!\n", cmd, cmd);
                cfpkt_destroy(pkt);
                return -EPROTO;
        }
@@ -84,14 +85,9 @@ static int cfvei_transmit(struct cflayer *layr, struct cfpkt *pkt)
                return ret;
        caif_assert(layr->dn != NULL);
        caif_assert(layr->dn->transmit != NULL);
-       if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
-               pr_warning("CAIF: %s(): Packet too large - size=%d\n",
-                          __func__, cfpkt_getlen(pkt));
-               return -EOVERFLOW;
-       }
 
        if (cfpkt_add_head(pkt, &tmp, 1) < 0) {
-               pr_err("CAIF: %s(): Packet is erroneous!\n", __func__);
+               pr_err("Packet is erroneous!\n");
                return -EPROTO;
        }