diff for duplicates of <20150305131215.GA5607@sloth> diff --git a/a/1.txt b/N1/1.txt index ff98d11..cc0cc99 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ constant char[] c; @@ e = \(kzalloc\|kmalloc\|devm_kzalloc\|devm_kmalloc\)(...); -if (e = NULL) { +if (e == NULL) { <+... - print(...,c,...); ... when any @@ -49,9 +49,9 @@ index 248cc0d..32cc8df 100644 rtllib_softmac_init(ieee); ieee->pHTInfo = kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL); -- if (ieee->pHTInfo = NULL) { +- if (ieee->pHTInfo == NULL) { - RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for HTInfo\n"); -+ if (ieee->pHTInfo = NULL) ++ if (ieee->pHTInfo == NULL) return NULL; - } + @@ -64,7 +64,7 @@ index 1664040..0a9cf44 100644 +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -394,10 +394,9 @@ static int is_duplicate_packet(struct rtllib_device *ieee, } - if (p = &ieee->ibss_mac_hash[index]) { + if (p == &ieee->ibss_mac_hash[index]) { entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC); - if (!entry) { - printk(KERN_WARNING "Cannot malloc new mac entry\n"); @@ -79,15 +79,15 @@ index 1664040..0a9cf44 100644 /* skb: hdr + (possible reassembled) full plaintext payload */ payload = skb->data + hdrlen; rxb = kmalloc(sizeof(struct rtllib_rxb), GFP_ATOMIC); -- if (rxb = NULL) { +- if (rxb == NULL) { - RTLLIB_DEBUG(RTLLIB_DL_ERR, - "%s(): kmalloc rxb error\n", __func__); -+ if (rxb = NULL) ++ if (rxb == NULL) goto rx_dropped; - } + /* to parse amsdu packets */ /* qos data packets & reserved bit is 1 */ - if (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) = 0) { + if (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) == 0) { -- 1.9.1 diff --git a/a/content_digest b/N1/content_digest index 72c9474..0b9b177 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Quentin Lambert <lambert.quentin@gmail.com>\0" "Subject\0[PATCH 1/1] staging: rtl8192e: Remove unnecessary OOM message\0" - "Date\0Thu, 05 Mar 2015 13:12:15 +0000\0" + "Date\0Thu, 5 Mar 2015 14:12:15 +0100\0" "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Cc\0kernel-janitors@vger.kernel.org" devel@driverdev.osuosl.org @@ -20,7 +20,7 @@ "@@\n" "\n" "e = \\(kzalloc\\|kmalloc\\|devm_kzalloc\\|devm_kmalloc\\)(...);\n" - "if (e = NULL) {\n" + "if (e == NULL) {\n" " <+...\n" "- print(...,c,...);\n" " ... when any\n" @@ -58,9 +58,9 @@ " \trtllib_softmac_init(ieee);\n" " \n" " \tieee->pHTInfo = kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL);\n" - "-\tif (ieee->pHTInfo = NULL) {\n" + "-\tif (ieee->pHTInfo == NULL) {\n" "-\t\tRTLLIB_DEBUG(RTLLIB_DL_ERR, \"can't alloc memory for HTInfo\\n\");\n" - "+\tif (ieee->pHTInfo = NULL)\n" + "+\tif (ieee->pHTInfo == NULL)\n" " \t\treturn NULL;\n" "-\t}\n" "+\n" @@ -73,7 +73,7 @@ "+++ b/drivers/staging/rtl8192e/rtllib_rx.c\n" "@@ -394,10 +394,9 @@ static int is_duplicate_packet(struct rtllib_device *ieee,\n" " \t\t}\n" - " \t\tif (p = &ieee->ibss_mac_hash[index]) {\n" + " \t\tif (p == &ieee->ibss_mac_hash[index]) {\n" " \t\t\tentry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC);\n" "-\t\t\tif (!entry) {\n" "-\t\t\t\tprintk(KERN_WARNING \"Cannot malloc new mac entry\\n\");\n" @@ -88,17 +88,17 @@ " \t/* skb: hdr + (possible reassembled) full plaintext payload */\n" " \tpayload = skb->data + hdrlen;\n" " \trxb = kmalloc(sizeof(struct rtllib_rxb), GFP_ATOMIC);\n" - "-\tif (rxb = NULL) {\n" + "-\tif (rxb == NULL) {\n" "-\t\tRTLLIB_DEBUG(RTLLIB_DL_ERR,\n" "-\t\t\t \"%s(): kmalloc rxb error\\n\", __func__);\n" - "+\tif (rxb = NULL)\n" + "+\tif (rxb == NULL)\n" " \t\tgoto rx_dropped;\n" "-\t}\n" "+\n" " \t/* to parse amsdu packets */\n" " \t/* qos data packets & reserved bit is 1 */\n" - " \tif (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) = 0) {\n" + " \tif (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) == 0) {\n" "-- \n" 1.9.1 -8953ad7beb3d6148c287cd63cdfd18aabcf8e977a9a3a7fb29dbac7f962bd8f1 +7b38112f6927d34850ecfb6c735346c8c610f9667e8a5ede4cd919b84b203878
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.