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

caif: remove unesesarry exports

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

authored by

sjur.brandeland@stericsson.com and committed by
David S. Miller
3f874adc 33b2f559

+14 -26
-1
include/net/caif/cfpkt.h
··· 195 195 * @return Packet information 196 196 */ 197 197 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt); 198 - /*! @} */ 199 198 #endif /* CFPKT_H_ */
+2 -2
net/caif/caif_socket.c
··· 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 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;
-1
net/caif/cfcnfg.c
··· 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 {
+8 -19
net/caif/cfpkt_skbuff.c
··· 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); 106 + 108 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); 113 + 115 114 116 115 int cfpkt_peek_head(struct cfpkt *pkt, void *data, u16 len) 117 116 { ··· 122 123 return !cfpkt_extr_head(pkt, data, len) && 123 124 !cfpkt_add_head(pkt, data, len); 124 125 } 125 - EXPORT_SYMBOL(cfpkt_peek_head); 126 126 127 127 int cfpkt_extr_head(struct cfpkt *pkt, void *data, u16 len) 128 128 { ··· 146 148 memcpy(data, from, len); 147 149 return 0; 148 150 } 149 - EXPORT_SYMBOL(cfpkt_extr_head); 150 151 151 152 int cfpkt_extr_trail(struct cfpkt *pkt, void *dta, u16 len) 152 153 { ··· 168 171 memcpy(data, from, len); 169 172 return 0; 170 173 } 171 - EXPORT_SYMBOL(cfpkt_extr_trail); 174 + 172 175 173 176 int cfpkt_pad_trail(struct cfpkt *pkt, u16 len) 174 177 { 175 178 return cfpkt_add_body(pkt, NULL, len); 176 179 } 177 - EXPORT_SYMBOL(cfpkt_pad_trail); 180 + 178 181 179 182 int cfpkt_add_body(struct cfpkt *pkt, const void *data, u16 len) 180 183 { ··· 223 226 memcpy(to, data, len); 224 227 return 0; 225 228 } 226 - EXPORT_SYMBOL(cfpkt_add_body); 227 229 228 230 inline int cfpkt_addbdy(struct cfpkt *pkt, u8 data) 229 231 { 230 232 return cfpkt_add_body(pkt, &data, 1); 231 233 } 232 - EXPORT_SYMBOL(cfpkt_addbdy); 233 234 234 235 int cfpkt_add_head(struct cfpkt *pkt, const void *data2, u16 len) 235 236 { ··· 254 259 memcpy(to, data, len); 255 260 return 0; 256 261 } 257 - EXPORT_SYMBOL(cfpkt_add_head); 262 + 258 263 259 264 inline int cfpkt_add_trail(struct cfpkt *pkt, const void *data, u16 len) 260 265 { 261 266 return cfpkt_add_body(pkt, data, len); 262 267 } 263 - EXPORT_SYMBOL(cfpkt_add_trail); 268 + 264 269 265 270 inline u16 cfpkt_getlen(struct cfpkt *pkt) 266 271 { 267 272 struct sk_buff *skb = pkt_to_skb(pkt); 268 273 return skb->len; 269 274 } 270 - EXPORT_SYMBOL(cfpkt_getlen); 275 + 271 276 272 277 inline u16 cfpkt_iterate(struct cfpkt *pkt, 273 278 u16 (*iter_func)(u16, void *, u16), ··· 285 290 } 286 291 return iter_func(data, pkt->skb.data, cfpkt_getlen(pkt)); 287 292 } 288 - EXPORT_SYMBOL(cfpkt_iterate); 293 + 289 294 290 295 int cfpkt_setlen(struct cfpkt *pkt, u16 len) 291 296 { ··· 310 315 311 316 return cfpkt_getlen(pkt); 312 317 } 313 - EXPORT_SYMBOL(cfpkt_setlen); 314 318 315 319 struct cfpkt *cfpkt_append(struct cfpkt *dstpkt, 316 320 struct cfpkt *addpkt, ··· 351 357 dst->len += addlen; 352 358 return skb_to_pkt(dst); 353 359 } 354 - EXPORT_SYMBOL(cfpkt_append); 355 360 356 361 struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos) 357 362 { ··· 388 395 skb2->len += len2nd; 389 396 return skb_to_pkt(skb2); 390 397 } 391 - EXPORT_SYMBOL(cfpkt_split); 392 398 393 399 bool cfpkt_erroneous(struct cfpkt *pkt) 394 400 { 395 401 return cfpkt_priv(pkt)->erronous; 396 402 } 397 - EXPORT_SYMBOL(cfpkt_erroneous); 398 - 399 403 400 404 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt) 401 405 { 402 406 return (struct caif_payload_info *)&pkt_to_skb(pkt)->cb; 403 407 } 404 - EXPORT_SYMBOL(cfpkt_info);
+4 -3
net/caif/chnl_net.c
··· 83 83 if (!priv) 84 84 return -EINVAL; 85 85 86 - /* Get length of CAIF packet. */ 87 - pktlen = cfpkt_getlen(pkt); 88 - 89 86 skb = (struct sk_buff *) cfpkt_tonative(pkt); 87 + 88 + /* Get length of CAIF packet. */ 89 + pktlen = skb->len; 90 + 90 91 /* Pass some minimum information and 91 92 * send the packet to the net stack. 92 93 */