aboutsummaryrefslogtreecommitdiffstats
path: root/net/packet/af_packet.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-11 00:21:55 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:20 -0400
commitb0e380b1d8a8e0aca215df97702f99815f05c094 (patch)
tree95f402ca155f5211150178811669ebf0a88e8e00 /net/packet/af_packet.c
parentcfe1fc7759fdacb0c650b575daed1692bf3eaece (diff)
[SK_BUFF]: unions of just one member don't get anything done, kill them
Renaming skb->h to skb->transport_header, skb->nh to skb->network_header and skb->mac to skb->mac_header, to match the names of the associated helpers (skb[_[re]set]_{transport,network,mac}_header). Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet/af_packet.c')
-rw-r--r--net/packet/af_packet.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index a059cc7be672..51c059b09a37 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -114,22 +114,22 @@ On receive:
114----------- 114-----------
115 115
116Incoming, dev->hard_header!=NULL 116Incoming, dev->hard_header!=NULL
117 mac.raw -> ll header 117 mac_header -> ll header
118 data -> data 118 data -> data
119 119
120Outgoing, dev->hard_header!=NULL 120Outgoing, dev->hard_header!=NULL
121 mac.raw -> ll header 121 mac_header -> ll header
122 data -> ll header 122 data -> ll header
123 123
124Incoming, dev->hard_header==NULL 124Incoming, dev->hard_header==NULL
125 mac.raw -> UNKNOWN position. It is very likely, that it points to ll header. 125 mac_header -> UNKNOWN position. It is very likely, that it points to ll
126 PPP makes it, that is wrong, because introduce assymetry 126 header. PPP makes it, that is wrong, because introduce
127 between rx and tx paths. 127 assymetry between rx and tx paths.
128 data -> data 128 data -> data
129 129
130Outgoing, dev->hard_header==NULL 130Outgoing, dev->hard_header==NULL
131 mac.raw -> data. ll header is still not built! 131 mac_header -> data. ll header is still not built!
132 data -> data 132 data -> data
133 133
134Resume 134Resume
135 If dev->hard_header==NULL we are unlikely to restore sensible ll header. 135 If dev->hard_header==NULL we are unlikely to restore sensible ll header.
@@ -139,12 +139,12 @@ On transmit:
139------------ 139------------
140 140
141dev->hard_header != NULL 141dev->hard_header != NULL
142 mac.raw -> ll header 142 mac_header -> ll header
143 data -> ll header 143 data -> ll header
144 144
145dev->hard_header == NULL (ll header is added by device, we cannot control it) 145dev->hard_header == NULL (ll header is added by device, we cannot control it)
146 mac.raw -> data 146 mac_header -> data
147 data -> data 147 data -> data
148 148
149 We should set nh.raw on output to correct posistion, 149 We should set nh.raw on output to correct posistion,
150 packet classifier depends on it. 150 packet classifier depends on it.