Skip to content

Commit

Permalink
Support for cheap Ralink 3070 WiFi plug
Browse files Browse the repository at this point in the history 
See: #321
  • Loading branch information
@popcornmix
popcornmix committed Dec 9, 2013
1 parent f4f8ebe commit ac438ad
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/net/wireless/rt2x00/rt2800lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3155,6 +3155,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
case RF3070:
case RF5360:
case RF5370:
case RF3070:
case RF5372:
case RF5390:
case RF5392:
Expand All @@ -3172,6 +3173,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
rt2x00_rf(rt2x00dev, RF3322) ||
rt2x00_rf(rt2x00dev, RF5360) ||
rt2x00_rf(rt2x00dev, RF5370) ||
rt2x00_rf(rt2x00dev, RF3070) ||
rt2x00_rf(rt2x00dev, RF5372) ||
rt2x00_rf(rt2x00dev, RF5390) ||
rt2x00_rf(rt2x00dev, RF5392)) {
Expand Down Expand Up @@ -4270,6 +4272,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
case RF3290:
case RF5360:
case RF5370:
case RF3070:
case RF5372:
case RF5390:
case RF5392:
Expand Down Expand Up @@ -7033,6 +7036,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
case RF3322:
case RF5360:
case RF5370:
case RF3070:
case RF5372:
case RF5390:
case RF5392:
Expand Down Expand Up @@ -7556,6 +7560,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
rt2x00_rf(rt2x00dev, RF3322) ||
rt2x00_rf(rt2x00dev, RF5360) ||
rt2x00_rf(rt2x00dev, RF5370) ||
rt2x00_rf(rt2x00dev, RF3070) ||
rt2x00_rf(rt2x00dev, RF5372) ||
rt2x00_rf(rt2x00dev, RF5390) ||
rt2x00_rf(rt2x00dev, RF5392)) {
Expand Down Expand Up @@ -7683,6 +7688,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
case RF3290:
case RF5360:
case RF5370:
case RF3070:
case RF5372:
case RF5390:
case RF5392:
Expand Down

5 comments on commit ac438ad

@moonman
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit is a duplicate of some other commit.

The error:

 drivers/net/wireless/rt2x00/rt2800lib.c: In function 'rt2800_config_channel':
 drivers/net/wireless/rt2x00/rt2800lib.c:3158:2: error: duplicate case value
 drivers/net/wireless/rt2x00/rt2800lib.c:3155:2: error: previously used here
   LD [M]  drivers/staging/zram/zram.o
   CC [M]  drivers/staging/wlan-ng/p80211conv.o
   CC      drivers/tty/tty_port.o
 drivers/net/wireless/rt2x00/rt2800lib.c: In function 'rt2800_vco_calibration':
 drivers/net/wireless/rt2x00/rt2800lib.c:4275:2: error: duplicate case value
 drivers/net/wireless/rt2x00/rt2800lib.c:4271:2: error: previously used here
   LD      drivers/staging/zsmalloc/zsmalloc.o
   LD      drivers/staging/zsmalloc/built-in.o
   CC [M]  drivers/staging/wlan-ng/p80211req.o
 In file included from drivers/staging/wlan-ng/prism2usb.c:5:0:
 drivers/staging/wlan-ng/prism2fw.c: In function 'read_cardpda.constprop.11':
 drivers/staging/wlan-ng/prism2fw.c:795:1: warning: the frame size of 1072 bytes is larger than 1024 bytes [-Wframe-larger-than=]
   CC [M]  drivers/net/wireless/rt2x00/rt2500usb.o
   CC [M]  drivers/net/wireless/rt2x00/rt73usb.o
   CC      drivers/tty/tty_mutex.o
   CC [M]  drivers/staging/wlan-ng/p80211wep.o
 drivers/net/wireless/rt2x00/rt2800lib.c: In function 'rt2800_init_eeprom':
 drivers/net/wireless/rt2x00/rt2800lib.c:7039:2: error: duplicate case value
 drivers/net/wireless/rt2x00/rt2800lib.c:7033:2: error: previously used here
 drivers/net/wireless/rt2x00/rt2800lib.c: In function 'rt2800_probe_hw_mode':
 drivers/net/wireless/rt2x00/rt2800lib.c:7691:2: error: duplicate case value
 drivers/net/wireless/rt2x00/rt2800lib.c:7687:2: error: previously used here
 distcc[18851] ERROR: compile drivers/net/wireless/rt2x00/rt2800lib.c on localhost failed
 scripts/Makefile.build:314: recipe for target 'drivers/net/wireless/rt2x00/rt2800lib.o' failed
 make[4]: *** [drivers/net/wireless/rt2x00/rt2800lib.o] Error 1
 make[4]: *** Waiting for unfinished jobs....

Looking at one of the affected files drivers/net/wireless/rt2x00/rt2800lib.c:

        case RF3070:
        case RF5360:
        case RF5370:
        case RF3070:
        case RF5372:
        case RF5390:
        case RF5392:

RF3070 repeated 2 times

@popcornmix
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry,
https://github.com/raspberrypi/linux/blob/rpi-3.10.y/drivers/net/wireless/rt2x00/rt2800lib.c#L3158
is not a case statement, and the file builds okay for me.
Do you have local changes to your tree?

@moonman
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You pointed to 3.10.y tree, the error happens with 3.12.y tree and only after 3.12.4

@popcornmix
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, missed that this was 3.12 tree. I've removed this commit. Okay now?

@moonman
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem and thank you. Should be ok now. I'll report back if it fails to build.

Please sign in to comment.