Skip to content

Kernel 4.1: ftgmac: Increase maximum NC-SI response payload size #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xzhang-brcm wants to merge 2 commits into
base: dev-4.1
Choose a base branch
from
Open

Kernel 4.1: ftgmac: Increase maximum NC-SI response payload size #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f307857
Kernel 4.1: ftgmac: Increase maximum NC-SI response payload size
xzhang-brcm Aug 23, 2020
638fb14
Merge remote-tracking branch 'upstream/dev-4.1' into dev-4.1
xzhang-brcm Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions drivers/net/ethernet/faraday/ftgmac100.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
#define MAX_PKT_SIZE 1518
#define RX_BUF_SIZE PAGE_SIZE /* must be smaller than 0x3fff */

#define MAX_NCSI_DATA_PAYLOAD 1480 /* for getting the size of the nc-si control data packet */
/* max ethernet frame size = 1518 */
/* ethernet headr (14) + nc-si header (16) + nc-si payload (1480) + nc-si checksum (4) + 4 (FCS) = 1518*/

#define noNCSI_DEBUG /* for debug printf messages */

/*
Expand Down Expand Up @@ -166,7 +162,7 @@ typedef struct ncsi_nl_msg_t {
} NCSI_NL_MSG_T;


#define MAX_RESPONSE_PAYLOAD 1024 /* maximum payload size*/
#define MAX_RESPONSE_PAYLOAD MAX_NCSI_DATA_PAYLOAD /* maximum payload size*/
typedef struct ncsi_nl_response {
uint8_t cmd;
uint16_t payload_length;
Expand Down
6 changes: 5 additions & 1 deletion drivers/net/ethernet/faraday/ftgmac100.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,10 @@ typedef struct {
#define GET_NCSI_STATISTICS 0x19
#define GET_NCSI_PASS_THROUGH_STATISTICS 0x1A

#define MAX_NCSI_DATA_PAYLOAD 1480 /* for getting the size of the nc-si control data packet */
/* max ethernet frame size = 1518 */
/* ethernet headr (14) + nc-si header (16) + nc-si payload (1480) + nc-si checksum (4) + 4 (FCS) = 1518*/

/* NC-SI Response Packet */
typedef struct {
unsigned char DA[6];
Expand All @@ -319,7 +323,7 @@ typedef struct {
/* end of NC-SI header */
unsigned short Response_Code;
unsigned short Reason_Code;
unsigned char Payload_Data[256];
unsigned char Payload_Data[MAX_NCSI_DATA_PAYLOAD-4]; /* Exclude resp/reason code */
} __attribute__((packed)) NCSI_Response_Packet;


Expand Down