diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-10 10:04:30 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-10 10:04:30 -1000 |
| commit | 95aa17c36dc89bf008753217ed27f8a8eb5faf79 (patch) | |
| tree | 196b6e4d304634f891c95ba0f4a556e0adf8d309 | |
| parent | 33563138ac2fa38fd4fb9fc79a2c29be4ea65642 (diff) | |
| parent | 20314bacd2f9b1b8fc10895417e6db0dc85f8248 (diff) | |
| download | linux-95aa17c36dc89bf008753217ed27f8a8eb5faf79.tar.gz linux-95aa17c36dc89bf008753217ed27f8a8eb5faf79.tar.bz2 linux-95aa17c36dc89bf008753217ed27f8a8eb5faf79.zip | |
Merge tag 'staging-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fix from Greg KH:
"Here is a single staging driver fix for 5.18-rc2 that resolves an
endian issue for the r8188eu driver. It has been in linux-next all
this week with no reported problems"
* tag 'staging-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: r8188eu: Fix PPPoE tag insertion on little endian systems
| -rw-r--r-- | drivers/staging/r8188eu/core/rtw_br_ext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c index d68611ef22f8..f056204c0fdb 100644 --- a/drivers/staging/r8188eu/core/rtw_br_ext.c +++ b/drivers/staging/r8188eu/core/rtw_br_ext.c @@ -70,7 +70,7 @@ static int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag) struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); int data_len; - data_len = tag->tag_len + TAG_HDR_LEN; + data_len = be16_to_cpu(tag->tag_len) + TAG_HDR_LEN; if (skb_tailroom(skb) < data_len) return -1; |