diff for duplicates of <1472656150.4176.7.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 59dbd27..931ba90 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,8 @@ True, the code above it is also confusing as it's #endif if (nd_config) { - adapter->nd_info kzalloc(sizeof(struct cfg80211_wowlan_nd_match) + + adapter->nd_info = + kzalloc(sizeof(struct cfg80211_wowlan_nd_match) + sizeof(struct cfg80211_wowlan_nd_match *) * scan_rsp->number_of_sets, GFP_ATOMIC); @@ -29,7 +30,8 @@ so the #endif seems misplaced. > > if (chan_band_tlv && adapter->nd_info) { -> adapter->nd_info->matches[idx] > - kzalloc(sizeof(*pmatch) + +> adapter->nd_info->matches[idx] = +> - kzalloc(sizeof(*pmatch) + > - sizeof(u32), GFP_ATOMIC); > + kzalloc(sizeof(*pmatch) + sizeof(u32), > + GFP_ATOMIC); @@ -40,7 +42,8 @@ so the #endif seems misplaced. > - memset(pmatch, 0, sizeof(*pmatch)); > - if (chan_band_tlv) { > - pmatch->n_channels = 1; -> - pmatch->channels[0] > - chan_band->chan_number; +> - pmatch->channels[0] = +> - chan_band->chan_number; > - } > + pmatch->n_channels = 1; > + pmatch->channels[0] = chan_band->chan_number; @@ -52,8 +55,3 @@ and alloc to pmatch then assign adapter->nd_info->matches[idx] later. I think the #ifdef CONFIG_PM use in this routine is incomplete. - --- -To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index a65e372..ee3a590 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01472644259-15605-1-git-send-email-christophe.jaillet@wanadoo.fr\0" "From\0Joe Perches <joe@perches.com>\0" "Subject\0Re: [PATCH] mwifiex: scan: Simplify code\0" - "Date\0Wed, 31 Aug 2016 15:09:10 +0000\0" + "Date\0Wed, 31 Aug 2016 08:09:10 -0700\0" "To\0Christophe JAILLET <christophe.jaillet@wanadoo.fr>" akarwar@marvell.com nishants@marvell.com @@ -27,7 +27,8 @@ "#endif\n" "\n" "\tif (nd_config) {\n" - "\t\tadapter->nd_info \t\t\tkzalloc(sizeof(struct cfg80211_wowlan_nd_match) +\n" + "\t\tadapter->nd_info =\n" + "\t\t\tkzalloc(sizeof(struct cfg80211_wowlan_nd_match) +\n" "\t\t\t\tsizeof(struct cfg80211_wowlan_nd_match *) *\n" "\t\t\t\tscan_rsp->number_of_sets, GFP_ATOMIC);\n" "\n" @@ -43,7 +44,8 @@ "\n" "> \302\240\n" "> \302\240\t\tif (chan_band_tlv && adapter->nd_info) {\n" - "> \302\240\t\t\tadapter->nd_info->matches[idx] > -\t\t\t\tkzalloc(sizeof(*pmatch) +\n" + "> \302\240\t\t\tadapter->nd_info->matches[idx] =\n" + "> -\t\t\t\tkzalloc(sizeof(*pmatch) +\n" "> -\t\t\t\tsizeof(u32), GFP_ATOMIC);\n" "> +\t\t\t\tkzalloc(sizeof(*pmatch) + sizeof(u32),\n" "> +\t\t\t\t\tGFP_ATOMIC);\n" @@ -54,7 +56,8 @@ "> -\t\t\t\tmemset(pmatch, 0, sizeof(*pmatch));\n" "> -\t\t\t\tif (chan_band_tlv) {\n" "> -\t\t\t\t\tpmatch->n_channels = 1;\n" - "> -\t\t\t\t\tpmatch->channels[0] > -\t\t\t\t\t\tchan_band->chan_number;\n" + "> -\t\t\t\t\tpmatch->channels[0] =\n" + "> -\t\t\t\t\t\tchan_band->chan_number;\n" "> -\t\t\t\t}\n" "> +\t\t\t\tpmatch->n_channels = 1;\n" "> +\t\t\t\tpmatch->channels[0] = chan_band->chan_number;\n" @@ -65,11 +68,6 @@ "and alloc to pmatch then assign adapter->nd_info->matches[idx]\n" "later.\n" "\n" - "I think the #ifdef CONFIG_PM use in this routine is incomplete.\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe kernel-janitors\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + I think the #ifdef CONFIG_PM use in this routine is incomplete. -9d1a415b76fe8fa08a1647d25dd206e5e51a79b1e255896788686fbcdce6b339 +46e38fd1a7eb5c8a8820b2662e4d6693f16e00ef500fc2e29f0c2c5a7e13fe9f
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.