Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

llc/snap: constify dev_addr passing

In preparation for netdev->dev_addr being constant
make all relevant arguments in LLC and SNAP constant.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+10 -9
+1 -1
include/net/datalink.h
··· 12 12 int (*rcvfunc)(struct sk_buff *, struct net_device *, 13 13 struct packet_type *, struct net_device *); 14 14 int (*request)(struct datalink_proto *, struct sk_buff *, 15 - unsigned char *); 15 + const unsigned char *); 16 16 struct list_head node; 17 17 }; 18 18
+1 -1
include/net/llc.h
··· 133 133 struct llc_sap *llc_sap_find(unsigned char sap_value); 134 134 135 135 int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb, 136 - unsigned char *dmac, unsigned char dsap); 136 + const unsigned char *dmac, unsigned char dsap); 137 137 138 138 void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb); 139 139 void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
+2 -1
include/net/llc_if.h
··· 62 62 #define LLC_STATUS_CONFLICT 7 /* disconnect conn */ 63 63 #define LLC_STATUS_RESET_DONE 8 /* */ 64 64 65 - int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap); 65 + int llc_establish_connection(struct sock *sk, const u8 *lmac, u8 *dmac, 66 + u8 dsap); 66 67 int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb); 67 68 int llc_send_disc(struct sock *sk); 68 69 #endif /* LLC_IF_H */
+1 -1
net/802/p8022.c
··· 23 23 #include <net/p8022.h> 24 24 25 25 static int p8022_request(struct datalink_proto *dl, struct sk_buff *skb, 26 - unsigned char *dest) 26 + const unsigned char *dest) 27 27 { 28 28 llc_build_and_send_ui_pkt(dl->sap, skb, dest, dl->sap->laddr.lsap); 29 29 return 0;
+1 -1
net/802/psnap.c
··· 79 79 * Put a SNAP header on a frame and pass to 802.2 80 80 */ 81 81 static int snap_request(struct datalink_proto *dl, 82 - struct sk_buff *skb, u8 *dest) 82 + struct sk_buff *skb, const u8 *dest) 83 83 { 84 84 memcpy(skb_push(skb, 5), dl->type, 5); 85 85 llc_build_and_send_ui_pkt(snap_sap, skb, dest, snap_sap->laddr.lsap);
+1 -1
net/llc/llc_c_ac.c
··· 781 781 782 782 if (nskb) { 783 783 struct llc_sap *sap = llc->sap; 784 - u8 *dmac = llc->daddr.mac; 784 + const u8 *dmac = llc->daddr.mac; 785 785 786 786 if (llc->dev->flags & IFF_LOOPBACK) 787 787 dmac = llc->dev->dev_addr;
+1 -1
net/llc/llc_if.c
··· 80 80 * establishment will inform to upper layer via calling it's confirm 81 81 * function and passing proper information. 82 82 */ 83 - int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap) 83 + int llc_establish_connection(struct sock *sk, const u8 *lmac, u8 *dmac, u8 dsap) 84 84 { 85 85 int rc = -EISCONN; 86 86 struct llc_addr laddr, daddr;
+1 -1
net/llc/llc_output.c
··· 56 56 * package primitive as an event and send to SAP event handler 57 57 */ 58 58 int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb, 59 - unsigned char *dmac, unsigned char dsap) 59 + const unsigned char *dmac, unsigned char dsap) 60 60 { 61 61 int rc; 62 62 llc_pdu_header_init(skb, LLC_PDU_TYPE_U, sap->laddr.lsap,
+1 -1
net/llc/llc_proc.c
··· 26 26 #include <net/llc_c_st.h> 27 27 #include <net/llc_conn.h> 28 28 29 - static void llc_ui_format_mac(struct seq_file *seq, u8 *addr) 29 + static void llc_ui_format_mac(struct seq_file *seq, const u8 *addr) 30 30 { 31 31 seq_printf(seq, "%pM", addr); 32 32 }