Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code »

Commit 3f874adc4ae80828b79e8aac6891c108c1f6be6d

Authored by sjur.brandeland@stericsson.com
Committed by David S. Miller
1 parent 33b2f5598b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

caif: remove unesesarry exports 

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 13 additions and 25 deletions Side-by-side Diff

include/net/caif/cfpkt.h
Diff comments   View file @ 3f874ad
... ... @@ -195,6 +195,5 @@
195 195 * @return Packet information
196 196 */
197 197 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt);
198   -/*! @} */
199 198 #endif /* CFPKT_H_ */
net/caif/caif_socket.c
Diff comments   View file @ 3f874ad
... ... @@ -205,7 +205,7 @@
205 205 skb = cfpkt_tonative(pkt);
206 206  
207 207 if (unlikely(cf_sk->sk.sk_state != CAIF_CONNECTED)) {
208   - cfpkt_destroy(pkt);
  208 + kfree_skb(skb);
209 209 return 0;
210 210 }
211 211 caif_queue_rcv_skb(&cf_sk->sk, skb);
... ... @@ -537,7 +537,7 @@
537 537 struct cfpkt *pkt;
538 538  
539 539 pkt = cfpkt_fromnative(CAIF_DIR_OUT, skb);
540   - memset(cfpkt_info(pkt), 0, sizeof(struct caif_payload_info));
  540 + memset(skb->cb, 0, sizeof(struct caif_payload_info));
541 541  
542 542 if (cf_sk->layer.dn == NULL)
543 543 return -EINVAL;
... ... @@ -117,7 +117,6 @@
117 117 kfree(this);
118 118 return NULL;
119 119 }
120   -EXPORT_SYMBOL(cfcnfg_create);
121 120  
122 121 void cfcnfg_remove(struct cfcnfg *cfg)
123 122 {
net/caif/cfpkt_skbuff.c
Diff comments   View file @ 3f874ad
... ... @@ -97,22 +97,21 @@
97 97 {
98 98 return cfpkt_create_pfx(len + PKT_POSTFIX, PKT_PREFIX);
99 99 }
100   -EXPORT_SYMBOL(cfpkt_create);
101 100  
102 101 void cfpkt_destroy(struct cfpkt *pkt)
103 102 {
104 103 struct sk_buff *skb = pkt_to_skb(pkt);
105 104 kfree_skb(skb);
106 105 }
107   -EXPORT_SYMBOL(cfpkt_destroy);
108 106  
  107 +
109 108 inline bool cfpkt_more(struct cfpkt *pkt)
110 109 {
111 110 struct sk_buff *skb = pkt_to_skb(pkt);
112 111 return skb->len > 0;
113 112 }
114   -EXPORT_SYMBOL(cfpkt_more);
115 113  
  114 +
116 115 int cfpkt_peek_head(struct cfpkt *pkt, void *data, u16 len)
117 116 {
118 117 struct sk_buff *skb = pkt_to_skb(pkt);
... ... @@ -123,7 +122,6 @@
123 122 return !cfpkt_extr_head(pkt, data, len) &&
124 123 !cfpkt_add_head(pkt, data, len);
125 124 }
126   -EXPORT_SYMBOL(cfpkt_peek_head);
127 125  
128 126 int cfpkt_extr_head(struct cfpkt *pkt, void *data, u16 len)
129 127 {
... ... @@ -148,7 +146,6 @@
148 146 memcpy(data, from, len);
149 147 return 0;
150 148 }
151   -EXPORT_SYMBOL(cfpkt_extr_head);
152 149  
153 150 int cfpkt_extr_trail(struct cfpkt *pkt, void *dta, u16 len)
154 151 {
155 152  
156 153  
157 154  
... ... @@ -171,14 +168,14 @@
171 168 memcpy(data, from, len);
172 169 return 0;
173 170 }
174   -EXPORT_SYMBOL(cfpkt_extr_trail);
175 171  
  172 +
176 173 int cfpkt_pad_trail(struct cfpkt *pkt, u16 len)
177 174 {
178 175 return cfpkt_add_body(pkt, NULL, len);
179 176 }
180   -EXPORT_SYMBOL(cfpkt_pad_trail);
181 177  
  178 +
182 179 int cfpkt_add_body(struct cfpkt *pkt, const void *data, u16 len)
183 180 {
184 181 struct sk_buff *skb = pkt_to_skb(pkt);
185 182  
... ... @@ -226,13 +223,11 @@
226 223 memcpy(to, data, len);
227 224 return 0;
228 225 }
229   -EXPORT_SYMBOL(cfpkt_add_body);
230 226  
231 227 inline int cfpkt_addbdy(struct cfpkt *pkt, u8 data)
232 228 {
233 229 return cfpkt_add_body(pkt, &data, 1);
234 230 }
235   -EXPORT_SYMBOL(cfpkt_addbdy);
236 231  
237 232 int cfpkt_add_head(struct cfpkt *pkt, const void *data2, u16 len)
238 233 {
239 234  
240 235  
241 236  
242 237  
243 238  
... ... @@ -259,21 +254,21 @@
259 254 memcpy(to, data, len);
260 255 return 0;
261 256 }
262   -EXPORT_SYMBOL(cfpkt_add_head);
263 257  
  258 +
264 259 inline int cfpkt_add_trail(struct cfpkt *pkt, const void *data, u16 len)
265 260 {
266 261 return cfpkt_add_body(pkt, data, len);
267 262 }
268   -EXPORT_SYMBOL(cfpkt_add_trail);
269 263  
  264 +
270 265 inline u16 cfpkt_getlen(struct cfpkt *pkt)
271 266 {
272 267 struct sk_buff *skb = pkt_to_skb(pkt);
273 268 return skb->len;
274 269 }
275   -EXPORT_SYMBOL(cfpkt_getlen);
276 270  
  271 +
277 272 inline u16 cfpkt_iterate(struct cfpkt *pkt,
278 273 u16 (*iter_func)(u16, void *, u16),
279 274 u16 data)
280 275  
... ... @@ -290,8 +285,8 @@
290 285 }
291 286 return iter_func(data, pkt->skb.data, cfpkt_getlen(pkt));
292 287 }
293   -EXPORT_SYMBOL(cfpkt_iterate);
294 288  
  289 +
295 290 int cfpkt_setlen(struct cfpkt *pkt, u16 len)
296 291 {
297 292 struct sk_buff *skb = pkt_to_skb(pkt);
... ... @@ -315,7 +310,6 @@
315 310  
316 311 return cfpkt_getlen(pkt);
317 312 }
318   -EXPORT_SYMBOL(cfpkt_setlen);
319 313  
320 314 struct cfpkt *cfpkt_append(struct cfpkt *dstpkt,
321 315 struct cfpkt *addpkt,
... ... @@ -357,7 +351,6 @@
357 351 dst->len += addlen;
358 352 return skb_to_pkt(dst);
359 353 }
360   -EXPORT_SYMBOL(cfpkt_append);
361 354  
362 355 struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos)
363 356 {
364 357  
365 358  
366 359  
... ... @@ -395,18 +388,14 @@
395 388 skb2->len += len2nd;
396 389 return skb_to_pkt(skb2);
397 390 }
398   -EXPORT_SYMBOL(cfpkt_split);
399 391  
400 392 bool cfpkt_erroneous(struct cfpkt *pkt)
401 393 {
402 394 return cfpkt_priv(pkt)->erronous;
403 395 }
404   -EXPORT_SYMBOL(cfpkt_erroneous);
405 396  
406   -
407 397 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt)
408 398 {
409 399 return (struct caif_payload_info *)&pkt_to_skb(pkt)->cb;
410 400 }
411   -EXPORT_SYMBOL(cfpkt_info);
... ... @@ -83,10 +83,11 @@
83 83 if (!priv)
84 84 return -EINVAL;
85 85  
  86 + skb = (struct sk_buff *) cfpkt_tonative(pkt);
  87 +
86 88 /* Get length of CAIF packet. */
87   - pktlen = cfpkt_getlen(pkt);
  89 + pktlen = skb->len;
88 90  
89   - skb = (struct sk_buff *) cfpkt_tonative(pkt);
90 91 /* Pass some minimum information and
91 92 * send the packet to the net stack.
92 93 */