sources-4.4-gnu1-4.4-gnu1b.patch

   1 diff --git linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c
   2 index c430c8d60f02..2400bbdcac28 100644
   3 --- linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c
   4 +++ linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c
   5 @@ -2306,60 +2306,60 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
   6         switch (rev) {
   7         case 42:
   8                 if (phy->type == B43_PHYTYPE_AC)
   9 -                       filename = /*(DEBLOBBED)*/;
  10 +                       filename = "/*(DEBLOBBED)*/";
  11                 break;
  12         case 40:
  13                 if (phy->type == B43_PHYTYPE_AC)
  14 -                       filename = /*(DEBLOBBED)*/;
  15 +                       filename = "/*(DEBLOBBED)*/";
  16                 break;
  17         case 33:
  18                 if (phy->type == B43_PHYTYPE_LCN40)
  19 -                       filename = /*(DEBLOBBED)*/;
  20 +                       filename = "/*(DEBLOBBED)*/";
  21                 break;
  22         case 30:
  23                 if (phy->type == B43_PHYTYPE_N)
  24 -                       filename = /*(DEBLOBBED)*/;
  25 +                       filename = "/*(DEBLOBBED)*/";
  26                 break;
  27         case 29:
  28                 if (phy->type == B43_PHYTYPE_HT)
  29 -                       filename = /*(DEBLOBBED)*/;
  30 +                       filename = "/*(DEBLOBBED)*/";
  31                 break;
  32         case 26:
  33                 if (phy->type == B43_PHYTYPE_HT)
  34 -                       filename = /*(DEBLOBBED)*/;
  35 +                       filename = "/*(DEBLOBBED)*/";
  36                 break;
  37         case 28:
  38         case 25:
  39                 if (phy->type == B43_PHYTYPE_N)
  40 -                       filename = /*(DEBLOBBED)*/;
  41 +                       filename = "/*(DEBLOBBED)*/";
  42                 else if (phy->type == B43_PHYTYPE_LCN)
  43 -                       filename = /*(DEBLOBBED)*/;
  44 +                       filename = "/*(DEBLOBBED)*/";
  45                 break;
  46         case 24:
  47                 if (phy->type == B43_PHYTYPE_LCN)
  48 -                       filename = /*(DEBLOBBED)*/;
  49 +                       filename = "/*(DEBLOBBED)*/";
  50                 break;
  51         case 23:
  52                 if (phy->type == B43_PHYTYPE_N)
  53 -                       filename = /*(DEBLOBBED)*/;
  54 +                       filename = "/*(DEBLOBBED)*/";
  55                 break;
  56         case 16 ... 19:
  57                 if (phy->type == B43_PHYTYPE_N)
  58 -                       filename = /*(DEBLOBBED)*/;
  59 +                       filename = "/*(DEBLOBBED)*/";
  60                 else if (phy->type == B43_PHYTYPE_LP)
  61 -                       filename = /*(DEBLOBBED)*/;
  62 +                       filename = "/*(DEBLOBBED)*/";
  63                 break;
  64         case 15:
  65 -               filename = /*(DEBLOBBED)*/;
  66 +               filename = "/*(DEBLOBBED)*/";
  67                 break;
  68         case 14:
  69 -               filename = /*(DEBLOBBED)*/;
  70 +               filename = "/*(DEBLOBBED)*/";
  71                 break;
  72         case 13:
  73 -               filename = /*(DEBLOBBED)*/;
  74 +               filename = "/*(DEBLOBBED)*/";
  75                 break;
  76         case 11 ... 12:
  77 -               filename = /*(DEBLOBBED)*/;
  78 +               filename = "/*(DEBLOBBED)*/";
  79                 break;
  80         case 5 ... 10:
  81                 filename = "ucode5";
  82 @@ -2373,7 +2373,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
  83
  84         /* Get PCM code */
  85         if ((rev >= 5) && (rev <= 10))
  86 -               filename = /*(DEBLOBBED)*/;
  87 +               filename = "/*(DEBLOBBED)*/";
  88         else if (rev >= 11)
  89                 filename = NULL;
  90         else
  91 @@ -2392,53 +2392,53 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
  92         switch (dev->phy.type) {
  93         case B43_PHYTYPE_G:
  94                 if (rev == 13)
  95 -                       filename = /*(DEBLOBBED)*/;
  96 +                       filename = "/*(DEBLOBBED)*/";
  97                 else if (rev >= 5 && rev <= 10)
  98                         filename = "b0g0initvals5";
  99                 break;
 100         case B43_PHYTYPE_N:
 101                 if (rev == 30)
 102 -                       filename = /*(DEBLOBBED)*/;
 103 +                       filename = "/*(DEBLOBBED)*/";
 104                 else if (rev == 28 || rev == 25)
 105 -                       filename = /*(DEBLOBBED)*/;
 106 +                       filename = "/*(DEBLOBBED)*/";
 107                 else if (rev == 24)
 108 -                       filename = /*(DEBLOBBED)*/;
 109 +                       filename = "/*(DEBLOBBED)*/";
 110                 else if (rev == 23)
 111 -                       filename = /*(DEBLOBBED)*/; /*(DEBLOBBED)*/
 112 +                       filename = "/*(DEBLOBBED)*/"; /*(DEBLOBBED)*/
 113                 else if (rev >= 16 && rev <= 18)
 114 -                       filename = /*(DEBLOBBED)*/;
 115 +                       filename = "/*(DEBLOBBED)*/";
 116                 else if (rev >= 11 && rev <= 12)
 117 -                       filename = /*(DEBLOBBED)*/;
 118 +                       filename = "/*(DEBLOBBED)*/";
 119                 break;
 120         case B43_PHYTYPE_LP:
 121                 if (rev >= 16 && rev <= 18)
 122 -                       filename = /*(DEBLOBBED)*/;
 123 +                       filename = "/*(DEBLOBBED)*/";
 124                 else if (rev == 15)
 125 -                       filename = /*(DEBLOBBED)*/;
 126 +                       filename = "/*(DEBLOBBED)*/";
 127                 else if (rev == 14)
 128 -                       filename = /*(DEBLOBBED)*/;
 129 +                       filename = "/*(DEBLOBBED)*/";
 130                 else if (rev == 13)
 131 -                       filename = /*(DEBLOBBED)*/;
 132 +                       filename = "/*(DEBLOBBED)*/";
 133                 break;
 134         case B43_PHYTYPE_HT:
 135                 if (rev == 29)
 136 -                       filename = /*(DEBLOBBED)*/;
 137 +                       filename = "/*(DEBLOBBED)*/";
 138                 else if (rev == 26)
 139 -                       filename = /*(DEBLOBBED)*/;
 140 +                       filename = "/*(DEBLOBBED)*/";
 141                 break;
 142         case B43_PHYTYPE_LCN:
 143                 if (rev == 24)
 144 -                       filename = /*(DEBLOBBED)*/;
 145 +                       filename = "/*(DEBLOBBED)*/";
 146                 break;
 147         case B43_PHYTYPE_LCN40:
 148                 if (rev == 33)
 149 -                       filename = /*(DEBLOBBED)*/;
 150 +                       filename = "/*(DEBLOBBED)*/";
 151                 break;
 152         case B43_PHYTYPE_AC:
 153                 if (rev == 42)
 154 -                       filename = /*(DEBLOBBED)*/;
 155 +                       filename = "/*(DEBLOBBED)*/";
 156                 else if (rev == 40)
 157 -                       filename = /*(DEBLOBBED)*/;
 158 +                       filename = "/*(DEBLOBBED)*/";
 159                 break;
 160         }
 161         if (!filename)
 162 @@ -2452,53 +2452,53 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
 163         switch (dev->phy.type) {
 164         case B43_PHYTYPE_G:
 165                 if (rev == 13)
 166 -                       filename = /*(DEBLOBBED)*/;
 167 +                       filename = "/*(DEBLOBBED)*/";
 168                 else if (rev >= 5 && rev <= 10)
 169                         filename = "b0g0bsinitvals5";
 170                 break;
 171         case B43_PHYTYPE_N:
 172                 if (rev == 30)
 173 -                       filename = /*(DEBLOBBED)*/;
 174 +                       filename = "/*(DEBLOBBED)*/";
 175                 else if (rev == 28 || rev == 25)
 176 -                       filename = /*(DEBLOBBED)*/;
 177 +                       filename = "/*(DEBLOBBED)*/";
 178                 else if (rev == 24)
 179 -                       filename = /*(DEBLOBBED)*/;
 180 +                       filename = "/*(DEBLOBBED)*/";
 181                 else if (rev == 23)
 182 -                       filename = /*(DEBLOBBED)*/; /*(DEBLOBBED)*/
 183 +                       filename = "/*(DEBLOBBED)*/"; /*(DEBLOBBED)*/
 184                 else if (rev >= 16 && rev <= 18)
 185 -                       filename = /*(DEBLOBBED)*/;
 186 +                       filename = "/*(DEBLOBBED)*/";
 187                 else if (rev >= 11 && rev <= 12)
 188 -                       filename = /*(DEBLOBBED)*/;
 189 +                       filename = "/*(DEBLOBBED)*/";
 190                 break;
 191         case B43_PHYTYPE_LP:
 192                 if (rev >= 16 && rev <= 18)
 193 -                       filename = /*(DEBLOBBED)*/;
 194 +                       filename = "/*(DEBLOBBED)*/";
 195                 else if (rev == 15)
 196 -                       filename = /*(DEBLOBBED)*/;
 197 +                       filename = "/*(DEBLOBBED)*/";
 198                 else if (rev == 14)
 199 -                       filename = /*(DEBLOBBED)*/;
 200 +                       filename = "/*(DEBLOBBED)*/";
 201                 else if (rev == 13)
 202 -                       filename = /*(DEBLOBBED)*/;
 203 +                       filename = "/*(DEBLOBBED)*/";
 204                 break;
 205         case B43_PHYTYPE_HT:
 206                 if (rev == 29)
 207 -                       filename = /*(DEBLOBBED)*/;
 208 +                       filename = "/*(DEBLOBBED)*/";
 209                 else if (rev == 26)
 210 -                       filename = /*(DEBLOBBED)*/;
 211 +                       filename = "/*(DEBLOBBED)*/";
 212                 break;
 213         case B43_PHYTYPE_LCN:
 214                 if (rev == 24)
 215 -                       filename = /*(DEBLOBBED)*/;
 216 +                       filename = "/*(DEBLOBBED)*/";
 217                 break;
 218         case B43_PHYTYPE_LCN40:
 219                 if (rev == 33)
 220 -                       filename = /*(DEBLOBBED)*/;
 221 +                       filename = "/*(DEBLOBBED)*/";
 222                 break;
 223         case B43_PHYTYPE_AC:
 224                 if (rev == 42)
 225 -                       filename = /*(DEBLOBBED)*/;
 226 +                       filename = "/*(DEBLOBBED)*/";
 227                 else if (rev == 40)
 228 -                       filename = /*(DEBLOBBED)*/;
 229 +                       filename = "/*(DEBLOBBED)*/";
 230                 break;
 231         }
 232         if (!filename)
 233 diff --git linux-libre-4.4-gnu1/drivers/net/wireless/b43legacy/main.c linux-libre-4.4-gnu1/drivers/net/wireless/b43legacy/main.c
 234 index 2f03d6790484..7d2a49e696bc 100644
 235 --- linux-libre-4.4-gnu1/drivers/net/wireless/b43legacy/main.c
 236 +++ linux-libre-4.4-gnu1/drivers/net/wireless/b43legacy/main.c
 237 @@ -1597,20 +1597,20 @@ static void b43legacy_request_firmware(struct work_struct *work)
 238
 239         if (!fw->ucode) {
 240                 if (rev == 2)
 241 -                       filename = /*(DEBLOBBED)*/;
 242 +                       filename = "/*(DEBLOBBED)*/";
 243                 else if (rev == 4)
 244 -                       filename = /*(DEBLOBBED)*/;
 245 +                       filename = "/*(DEBLOBBED)*/";
 246                 else
 247 -                       filename = "ucode5";
 248 +                       filename = "/*(DEBLOBBED)*/";
 249                 err = do_request_fw(dev, filename, &fw->ucode, true);
 250                 if (err)
 251                         goto err_load;
 252         }
 253         if (!fw->pcm) {
 254                 if (rev < 5)
 255 -                       filename = /*(DEBLOBBED)*/;
 256 +                       filename = "/*(DEBLOBBED)*/";
 257                 else
 258 -                       filename = /*(DEBLOBBED)*/;
 259 +                       filename = "/*(DEBLOBBED)*/";
 260                 err = do_request_fw(dev, filename, &fw->pcm, false);
 261                 if (err)
 262                         goto err_load;
 263 @@ -1620,9 +1620,9 @@ static void b43legacy_request_firmware(struct work_struct *work)
 264                 case B43legacy_PHYTYPE_B:
 265                 case B43legacy_PHYTYPE_G:
 266                         if ((rev >= 5) && (rev <= 10))
 267 -                               filename = "b0g0initvals5";
 268 +                               filename = "/*(DEBLOBBED)*/";
 269                         else if (rev == 2 || rev == 4)
 270 -                               filename = /*(DEBLOBBED)*/;
 271 +                               filename = "/*(DEBLOBBED)*/";
 272                         else
 273                                 goto err_no_initvals;
 274                         break;
 275 @@ -1638,7 +1638,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
 276                 case B43legacy_PHYTYPE_B:
 277                 case B43legacy_PHYTYPE_G:
 278                         if ((rev >= 5) && (rev <= 10))
 279 -                               filename = "b0g0bsinitvals5";
 280 +                               filename = "/*(DEBLOBBED)*/";
 281                         else if (rev >= 11)
 282                                 filename = NULL;
 283                         else if (rev == 2 || rev == 4)